Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 May 2016 18:53:27 +0000 (11:53 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 May 2016 18:53:27 +0000 (11:53 -0700)
commit17d25a337b75d656a34bdd52a477596c303b7f59
tree3052f35c2028107c9c7c41d128cdb7a82a1cfa7d
parent18fb92c30c766a5fb4593ecd0d9155b33d139e8e
parent2548d546d40c0014efdde88a53bf7896e917dcce
Merge branch 'sched-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull scheduler fix from Ingo Molnar:
 "This contains a single fix that fixes a nohz tick stopping bug when
  mixed-poliocy SCHED_FIFO and SCHED_RR tasks are present on a runqueue"

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  nohz/full, sched/rt: Fix missed tick-reenabling bug in sched_can_stop_tick()