tree 822f3ccd4b8b69a219a0593736860f88ad5a3337
parent bfd36050874d69db0548800a756456d180687f7b
parent bf0bd948d1682e3996adc093b43021ed391983e6
author Linus Torvalds <torvalds@linux-foundation.org> 1376438297 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1376438297 -0700

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

Pull scheduler fixes from Ingo Molnar:
 "Docbook fixes that make 99% of the diffstat, plus a oneliner fix"

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched: Ensure update_cfs_shares() is called for parents of continuously-running tasks
  sched: Fix some kernel-doc warnings