Merge commit 'v2.6.34-rc7' into perf/nmi
Frederic Weisbecker [Wed, 12 May 2010 21:19:01 +0000 (23:19 +0200)]
Merge reason: catch up with latest softlockup detector changes.

1  2 
arch/x86/Kconfig
arch/x86/kernel/apic/nmi.c
init/Kconfig
kernel/Makefile
kernel/sysctl.c
lib/Kconfig.debug

Simple merge
Simple merge
diff --cc init/Kconfig
Simple merge
diff --cc kernel/Makefile
Simple merge
diff --cc kernel/sysctl.c
  #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)
  
Simple merge