Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 May 2015 19:42:33 +0000 (12:42 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 May 2015 19:42:33 +0000 (12:42 -0700)
commit14db1e8dc08ca1b1ad8aa20e6ebfe0b395bbe5bf
tree04bc01379de22f1346e06cb6eb0dd46d44c51492
parentef4a293a4417fc5f50b0b83b62deb9ead8423256
parent533445c6e53368569e50ab3fb712230c03d523f3
Merge branch 'sched-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull scheduler fixes from Ingo Molnar:
 "Two fixes: a suspend/resume related regression fix, and an RT priority
  boosting fix"

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/core: Fix regression in cpuset_cpu_inactive() for suspend
  sched: Handle priority boosted tasks proper in setscheduler()