Merge branch 'linus' into sched/core
Ingo Molnar [Wed, 8 Dec 2010 19:15:26 +0000 (20:15 +0100)]
Merge reason: we want to queue up dependent cleanup

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1  2 
Documentation/kernel-parameters.txt
fs/proc/base.c
init/Kconfig
kernel/sched_fair.c

Simple merge
diff --cc fs/proc/base.c
Simple merge
diff --cc init/Kconfig
Simple merge
Simple merge