tree ef6ccc5e84c7152eff59d6db55733de42c32329b
parent ab5318788c6725b6d5c95aff28e63af4c35a0e2c
parent a57beec5d427086cdc8d75fd51164577193fa7f4
author Linus Torvalds <torvalds@linux-foundation.org> 1391187644 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1391187644 -0800

Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull scheduler fixes from Ingo Molnar:
 "A crash fix and documentation updates"

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched: Make sched_class::get_rr_interval() optional
  sched/deadline: Add sched_dl documentation
  sched: Fix docbook parameter annotation error in wait.h