projects / platform / kernel / linux-stable.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 86c7667 29bb9e5)
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 Jun 2013 18:18:35 +0000 (08:18 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 Jun 2013 18:18:35 +0000 (08:18 -1000)
Pull scheduler fixes from Ingo Molnar:
 "Two smaller fixes - plus a context tracking tracing fix that is a bit
  bigger"

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  tracing/context-tracking: Add preempt_schedule_context() for tracing
  sched: Fix clear NOHZ_BALANCE_KICK
  sched/x86: Construct all sibling maps if smt

1  2 
kernel/context_tracking.c patch | diff1 | diff2 | blob | history
kernel/sched/core.c patch | diff1 | diff2 | blob | history

diff --cc kernel/context_tracking.c
Simple merge
diff --cc kernel/sched/core.c
Simple merge
Domain: System / Kernel;