diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-17 23:03:50 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-17 23:03:50 +0100 |
commit | ab347d94d6515ea9a5be04faccd9b14a319b0a7a (patch) | |
tree | f7b10b1129dd62168313128446616bd5a5499cf8 | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jba... (diff) | |
parent | perf events: Fix ring_buffer_wakeup() brown paperbag bug (diff) | |
parent | sched: Fix select_idle_sibling() regression in selecting an idle SMT sibling (diff) | |
download | linux-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