tree 2a619a821024d31be2ce6ff422f287792379fe5b
parent 357ed6b1a110048ff8106f99092d6c4a7aadb45a
parent 203db2952bc87f5d610c9ad53a7d02b85897721f
parent d8ad7d1123a960cc9f276bd499f9325c6f5e1bd1
parent b5199515c25cca622495eb9c6a8a1d275e775088
parent c1f5c54b57341e872a9d375dccef7257f86033ef
author Linus Torvalds <torvalds@linux-foundation.org> 1308499218 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1308499218 -0700

Merge branches 'perf-urgent-for-linus', 'sched-urgent-for-linus', 'timers-urgent-for-linus' and 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  tools/perf: Fix static build of perf tool
  tracing: Fix regression in printk_formats file

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  generic-ipi: Fix kexec boot crash by initializing call_single_queue before enabling interrupts

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  clocksource: Make watchdog robust vs. interruption
  timerfd: Fix wakeup of processes when timer is cancelled on clock change

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, MAINTAINERS: Add x86 MCE people
  x86, efi: Do not reserve boot services regions within reserved areas