Merge branch 'core/softlockup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

* 'core/softlockup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  softlockup: fix invalid proc_handler for softlockup_panic
  softlockup: fix watchdog task wakeup frequency
  softlockup: fix watchdog task wakeup frequency
  softlockup: show irqtrace
  softlockup: print a module list on being stuck
  softlockup: fix NMI hangs due to lock race - 2.6.26-rc regression
  softlockup: fix false positives on nohz if CPU is 100% idle for more than 60 seconds
  softlockup: fix softlockup_thresh fix
  softlockup: fix softlockup_thresh unaligned access and disable detection at runtime
  softlockup: allow panic on lockup

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

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

diff --cc kernel/sysctl.c
index b859e6b5a767541b2b9016b6a8217b7ea595be8c,ab59ac008caf8c11a510e2ebe03d7a9e7ea81ec6..2a7b9d88706b41072e4a8fa7cec9a61d1e1e3381
--- 1/kernel/sysctl.c
--- 2/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@@ -83,12 -83,9 +83,12 @@@ extern int maps_protect
  extern int sysctl_stat_interval;
  extern int latencytop_enabled;
  extern int sysctl_nr_open_min, sysctl_nr_open_max;
 +#ifdef CONFIG_RCU_TORTURE_TEST
 +extern int rcutorture_runnable;
 +#endif /* #ifdef CONFIG_RCU_TORTURE_TEST */
  
  /* Constants used for minimum and  maximum */
- #if defined(CONFIG_DETECT_SOFTLOCKUP) || defined(CONFIG_HIGHMEM)
+ #if defined(CONFIG_HIGHMEM) || defined(CONFIG_DETECT_SOFTLOCKUP)
  static int one = 1;
  #endif
  

diff --cc lib/Kconfig.debug
Simple merge