Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 20 May 2018 18:23:34 +0000 (11:23 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 20 May 2018 18:23:34 +0000 (11:23 -0700)
commit441cab960d991897ec0e739dffee018bb2479c45
treef8ceb4e56cb0cb8d70aa705e05dbce7ed2e42e8c
parent74cce52f9f92b64febd7c84ed68f5a5607c779b6
parentcd33d8803bfa3f5e6e5d7a4bb03fc8cc32c40fb6
Merge branch 'sched-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull scheduler fixlets from Thomas Gleixner:
 "Three trivial fixlets for the scheduler:

   - move print_rt_rq() and print_dl_rq() declarations to the right
     place

   - make grub_reclaim() static

   - fix the bogus documentation reference in Kconfig"

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/fair: Fix documentation file path
  sched/deadline: Make the grub_reclaim() function static
  sched/debug: Move the print_rt_rq() and print_dl_rq() declarations to kernel/sched/sched.h