From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 23 May 2012 18:31:22 +0000 (-0700)
Subject: Merge branch 'x86-reboot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=2335a8366f63a5191b5a2b3c5a05d90fe814654c;p=~shefty%2Frdma-dev.git

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

Pull x86 reboot changes from Ingo Molnar:
 "The biggest change is a gentler method of rebooting/stopping via IRQs
  first and then via NMIs.  There are several cleanups in the tree as
  well."

* 'x86-reboot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/reboot: Update nonmi_ipi parameter
  x86/reboot: Use NMI to assist in shutting down if IRQ fails
  Revert "x86, reboot: Use NMI instead of REBOOT_VECTOR to stop cpus"
  x86/reboot: Clean up coding style
  x86/reboot: Reduce to a single DMI table for reboot quirks
---

2335a8366f63a5191b5a2b3c5a05d90fe814654c