Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
Linus Torvalds [Fri, 29 Oct 2010 15:05:33 +0000 (08:05 -0700)]
* '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

1  2 
include/linux/sched.h
kernel/sched.c
kernel/sched_fair.c

Simple merge
diff --cc kernel/sched.c
Simple merge
Simple merge