diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-17 14:03:50 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-17 14:03:50 -0800 |
| commit | ab347d94d6515ea9a5be04faccd9b14a319b0a7a (patch) | |
| tree | f7b10b1129dd62168313128446616bd5a5499cf8 /sound | |
| parent | a36bfddd65b58dd8c8364dba919c04922e04f2f5 (diff) | |
| parent | 44b7f4b98d8877e2a4427f2a2f2e42ae8227a58f (diff) | |
| parent | ab2789213d224202237292d78aaa0c386c7b28b2 (diff) | |
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