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_stat: Update sched_info_queue/dequeue() code comments
  sched, cgroup: Fixup broken cgroup movement
This commit is contained in:
Linus Torvalds 2010-10-29 08:05:33 -07:00
commit 37542b6a7e
4 changed files with 25 additions and 30 deletions

View file

@ -1080,7 +1080,7 @@ struct sched_class {
struct task_struct *task);
#ifdef CONFIG_FAIR_GROUP_SCHED
void (*moved_group) (struct task_struct *p, int on_rq);
void (*task_move_group) (struct task_struct *p, int on_rq);
#endif
};