Merge commit 'v2.6.34-rc7' into perf/nmi

Merge reason: catch up with latest softlockup detector changes.

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/kernel/apic/nmi.c
Simple merge

diff --cc init/Kconfig
Simple merge

diff --cc kernel/Makefile
Simple merge

diff --cc kernel/sysctl.c
index ac72c9e,8686b0f..a38af43
--- 1/kernel/sysctl.c
--- 2/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@@ -59,11 -61,19 +61,23 @@@
  #include <asm/stacktrace.h>
  #include <asm/io.h>
  #endif
+ #ifdef CONFIG_BSD_PROCESS_ACCT
+ #include <linux/acct.h>
+ #endif
+ #ifdef CONFIG_RT_MUTEXES
+ #include <linux/rtmutex.h>
+ #endif
+ #if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_LOCK_STAT)
+ #include <linux/lockdep.h>
+ #endif
+ #ifdef CONFIG_CHR_DEV_SG
+ #include <scsi/sg.h>
+ #endif
  
 +#ifdef CONFIG_NMI_WATCHDOG
 +#include <linux/nmi.h>
 +#endif
 +
  
  #if defined(CONFIG_SYSCTL)
  

diff --cc lib/Kconfig.debug
Simple merge