git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: a36bfdd)
Merge branches 'perf-urgent-for-linus' and 'sched-urgent-for-linus' of git://git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 17 Dec 2011 22:03:50 +0000 (14:03 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 17 Dec 2011 22:03:50 +0000 (14:03 -0800)
* '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

MAINTAINERS patch | blob | history
kernel/events/core.c patch | blob | history
kernel/sched_fair.c patch | blob | history

diff --cc MAINTAINERS
Simple merge
diff --cc kernel/events/core.c
Simple merge
diff --cc kernel/sched_fair.c
Simple merge
Pandora Kernel Repository