Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Aug 2013 23:58:17 +0000 (16:58 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Aug 2013 23:58:17 +0000 (16:58 -0700)
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

1  2 
include/linux/sched.h
kernel/sched/core.c
kernel/sched/fair.c

Simple merge
Simple merge
Simple merge