From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 17 Dec 2011 22:03:50 +0000 (-0800)
Subject: Merge branches 'perf-urgent-for-linus' and 'sched-urgent-for-linus' of git://git... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ab347d94d6515ea9a5be04faccd9b14a319b0a7a;p=openwrt%2Fstaging%2Fblogic.git

Merge branches 'perf-urgent-for-linus' and 'sched-urgent-for-linus' of git://git./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
---

ab347d94d6515ea9a5be04faccd9b14a319b0a7a