tree a64304991bba83bf3d59daf047b200c76b85da9c
parent 8de3f7a70572c55201f02b9db804e8eef13cb840
parent a1d9a3231eac4117cadaf4b6bba5b2902c15a33e
author Linus Torvalds <torvalds@linux-foundation.org> 1397929251 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1397929251 -0700

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 fixes:

   - a SCHED_DEADLINE task selection fix
   - a sched/numa related lockdep splat fix"

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched: Check for stop task appearance when balancing happens
  sched/numa: Fix task_numa_free() lockdep splat