]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
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)
* '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


Trivial merge