diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-23 11:31:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-23 11:31:22 -0700 |
| commit | 2335a8366f63a5191b5a2b3c5a05d90fe814654c (patch) | |
| tree | 20b2da7333a5003a22466895338e7734aa40f784 /arch/ia64/include/asm/Kbuild | |
| parent | 44bc40e1489622234169786b0ad5a1f4a01e1090 (diff) | |
| parent | 3aac27aba79b7c52e709ef6de0f7d8139caedc01 (diff) | |
| download | blackbird-op-linux-2335a8366f63a5191b5a2b3c5a05d90fe814654c.tar.gz blackbird-op-linux-2335a8366f63a5191b5a2b3c5a05d90fe814654c.zip | |
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
Diffstat (limited to 'arch/ia64/include/asm/Kbuild')
0 files changed, 0 insertions, 0 deletions
