From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 11 Nov 2009 19:29:24 +0000 (-0800)
Subject: Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=13b5892672073b1169b3b60b8a57123fb32c9df1;p=linux-edison.git

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
---

13b5892672073b1169b3b60b8a57123fb32c9df1