commit a3d5c3460a86f52ea435b3fb98be112bd18faabc
author Linus Torvalds <torvalds@linux-foundation.org> Thu Jun 20 08:18:35 2013 -1000
committer Linus Torvalds <torvalds@linux-foundation.org> Thu Jun 20 08:18:35 2013 -1000
tree 48a32968b569af0e0f0af1def3effa0770710fea
parent 86c76676cfdbf283f6131d5a2783bed3f3d490ea
parent 29bb9e5a75684106a37593ad75ec75ff8312731b

Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

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