summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-12-17 23:03:50 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2011-12-17 23:03:50 +0100
commitab347d94d6515ea9a5be04faccd9b14a319b0a7a (patch)
treef7b10b1129dd62168313128446616bd5a5499cf8 /kernel
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jba... (diff)
parentperf events: Fix ring_buffer_wakeup() brown paperbag bug (diff)
parentsched: Fix select_idle_sibling() regression in selecting an idle SMT sibling (diff)
downloadlinux-ab347d94d6515ea9a5be04faccd9b14a319b0a7a.tar.xz
linux-ab347d94d6515ea9a5be04faccd9b14a319b0a7a.zip
Merge branches 'perf-urgent-for-linus' and 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: perf events: Fix ring_buffer_wakeup() brown paperbag bug * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: sched: Fix select_idle_sibling() regression in selecting an idle SMT sibling MAINTAINERS: Update tip.git related git trees