tree 46904d68a5a68f22e6c6baf3472edd4c37a39481
parent 30d38542ec777468bb6a31829076a2dbc5690e35
parent 4dca10a96041f78bed11ce9e4a5cfde813ec4ccb
author Linus Torvalds <torvalds@linux-foundation.org> 1216863253 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1216863253 -0700

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

* '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