Merge branch 'linus' into core/softlockup
Ingo Molnar [Tue, 15 Jul 2008 21:12:58 +0000 (23:12 +0200)]
Conflicts:

kernel/softlockup.c

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

1  2 
Documentation/kernel-parameters.txt
include/linux/sched.h
kernel/sysctl.c
kernel/time/tick-sched.c
lib/Kconfig.debug

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