Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 11 Nov 2009 19:29:24 +0000 (11:29 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 11 Nov 2009 19:29:24 +0000 (11:29 -0800)
commit13b5892672073b1169b3b60b8a57123fb32c9df1
tree3272293873773aa5bf1ff5da69ae95b62ca781bd
parent605f37504f3afb590bf852bae4da5af8e462688e
parente9036b36eed4d3cdb33fa9cbcdd9888ae516889f
Merge branch 'sched-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  sched: Use root_task_group_empty only with FAIR_GROUP_SCHED
  sched: Fix kernel-doc function parameter name