diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-12 11:33:38 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-12 11:33:38 +0900 |
| commit | 986189f9ec81263c982b60433b5b937f1056a631 (patch) | |
| tree | 209b89a2f920f72541ffe5b5698ece959c584791 /arch/x86/include/asm/rwsem.h | |
| parent | 2934578e28be0a0b338ce701d3d87a4a6b0ff03b (diff) | |
| parent | 6d9153bbce50d41802ad2e20ce52daf699a3e8ad (diff) | |
| download | linux-986189f9ec81263c982b60433b5b937f1056a631.tar.bz2 | |
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:
"Misc changes - the only one with functional impact should be commit
16c21ae5ca63 ("reboot: Allow specifying warm/cold reset for CF9 boot
type") which extends cold/warm reboot handling to the 0xCF9 reboot
method"
* 'x86-reboot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/reboot: Correct pr_info() log message in the set_bios/pci/kbd_reboot()
x86/reboot: Sort reboot DMI quirks by vendor
x86/reboot: Remove the duplicate C6100 entry in the reboot quirks list
reboot: Allow specifying warm/cold reset for CF9 boot type
Diffstat (limited to 'arch/x86/include/asm/rwsem.h')
0 files changed, 0 insertions, 0 deletions