Merge branch 'linus' into sched/core
authorIngo Molnar <mingo@elte.hu>
Thu, 14 Oct 2010 07:11:43 +0000 (09:11 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 14 Oct 2010 07:11:46 +0000 (09:11 +0200)
commited859ed3b0f9893c6bce3708e8928341c15699b9
tree59c507f00bc13becb4accdd64fdc01ece08b4645
parenta8027073eb127cd207070891374b5c54c2ce3d23
parent53eeb64e808971207350386121f4bab12fa2f45f
Merge branch 'linus' into sched/core

Merge reason: update from -rc5 to -almost-final

Signed-off-by: Ingo Molnar <mingo@elte.hu>
kernel/sched.c
kernel/sched_fair.c