Merge branch 'linus' into core/softlockup

Conflicts:

	kernel/softlockup.c

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

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

diff --cc include/linux/sched.h
Simple merge

diff --cc kernel/sysctl.c
Simple merge

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

diff --cc lib/Kconfig.debug
Simple merge