summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-06-19 18:00:18 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-06-19 18:00:18 +0200
commit8816ead9d8e7c2745788e0684797e1912b504f33 (patch)
tree2a619a821024d31be2ce6ff422f287792379fe5b /kernel
parentMerge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff)
parenttools/perf: Fix static build of perf tool (diff)
parentgeneric-ipi: Fix kexec boot crash by initializing call_single_queue before en... (diff)
parentclocksource: Make watchdog robust vs. interruption (diff)
parentx86, MAINTAINERS: Add x86 MCE people (diff)
downloadlinux-8816ead9d8e7c2745788e0684797e1912b504f33.tar.xz
linux-8816ead9d8e7c2745788e0684797e1912b504f33.zip
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