tree 3272293873773aa5bf1ff5da69ae95b62ca781bd
parent 605f37504f3afb590bf852bae4da5af8e462688e
parent e9036b36eed4d3cdb33fa9cbcdd9888ae516889f
author Linus Torvalds <torvalds@linux-foundation.org> 1257967764 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1257967764 -0800

Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/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