Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 28 Oct 2017 00:17:25 +0000 (17:17 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 28 Oct 2017 00:17:25 +0000 (17:17 -0700)
Pull scheduler fix from Ingo Molnar:
 "Update the <linux/swait.h> documentation to discourage their use"

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/swait: Document it clearly that the swait facilities are special and shouldn't be used


Trivial merge