diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-25 13:29:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-25 13:29:18 -0700 |
| commit | 654fdd041227d7de1594baa61c58f2c87bd0640f (patch) | |
| tree | 8eb6c24923f5bc103eddf29b62c446aaa8e4447f /arch/sh | |
| parent | 82dfaa58a79c121be3611ce549dec806f2e6004f (diff) | |
| parent | 7a20c2fad61aa3624e83c671d36dbd36b2661476 (diff) | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar:
"An EFI fix and two reboot-quirk fixes"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/reboot: Fix apparent cut-n-paste mistake in Dell reboot workaround
x86/reboot: Add quirk to make Dell C6100 use reboot=pci automatically
x86, efi: Don't map Boot Services on i386
Diffstat (limited to 'arch/sh')
0 files changed, 0 insertions, 0 deletions