tree f7b10b1129dd62168313128446616bd5a5499cf8
parent a36bfddd65b58dd8c8364dba919c04922e04f2f5
parent 44b7f4b98d8877e2a4427f2a2f2e42ae8227a58f
parent ab2789213d224202237292d78aaa0c386c7b28b2
author Linus Torvalds <torvalds@linux-foundation.org> 1324159430 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1324159430 -0800

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