tree b23ecaff7078590215e91b2b6aa4c90c2d923e10
parent abd209b7083b2f3a2a19e522f688e7569f284e5d
parent 6ff968cca1dfebd4b6fcade87c11658dbfc96932
author Linus Torvalds <torvalds@linux-foundation.org> 1337653514 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1337653514 -0700

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

Pull core locking updates from Ingo Molnar:
 "This update:

   - extends and simplifies x86 NMI callback handling code to enhance
     and fix the HP hw-watchdog driver

   - simplifies the x86 NMI callback handling code to fix a kmemcheck
     bug.

   - enhances the hung-task debugger"

* 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/nmi: Fix the type of the nmiaction.flags field
  x86/nmi: Fix page faults by nmiaction if kmemcheck is enabled
  x86/nmi: Add new NMI queues to deal with IO_CHK and SERR
  watchdog, hpwdt: Remove priority option for NMI callback
  hung task debugging: Inject NMI when hung and going to panic