diff options
author | Linus Torvalds | 2014-08-14 02:21:35 +0200 |
---|---|---|
committer | Linus Torvalds | 2014-08-14 02:21:35 +0200 |
commit | d27c0d90184a13e9e9f28c38e84f889a259f6b5f (patch) | |
tree | a933c7b9c9ac96af1787fa11317842557358bf86 /arch/x86/kernel/apic | |
parent | Merge branch 'x86-xsave-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
parent | Merge tag 'efi-urgent' into x86/efi (diff) | |
download | kernel-qcow2-linux-d27c0d90184a13e9e9f28c38e84f889a259f6b5f.tar.gz kernel-qcow2-linux-d27c0d90184a13e9e9f28c38e84f889a259f6b5f.tar.xz kernel-qcow2-linux-d27c0d90184a13e9e9f28c38e84f889a259f6b5f.zip |
Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86/efix fixes from Peter Anvin:
"Two EFI-related Kconfig changes, which happen to touch immediately
adjacent lines in Kconfig and thus collapse to a single patch"
* 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/efi: Enforce CONFIG_RELOCATABLE for EFI boot stub
x86/efi: Fix 3DNow optimization build failure in EFI stub
Diffstat (limited to 'arch/x86/kernel/apic')
0 files changed, 0 insertions, 0 deletions