Merge branch 'linus' into sched/core

Merge reason: we want to queue up dependent cleanup

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

diff --cc Documentation/kernel-parameters.txt
Simple merge

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

diff --cc init/Kconfig
Simple merge

diff --cc kernel/sched_fair.c
Simple merge