| commit | d27c0d90184a13e9e9f28c38e84f889a259f6b5f | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Aug 13 18:21:35 2014 -0600 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Aug 13 18:21:35 2014 -0600 |
| tree | a933c7b9c9ac96af1787fa11317842557358bf86 | |
| parent | 7453f33b2e07fc2835e24cda0893de83c78d8d76 [diff] | |
| parent | 9e13bcf7e0981f1db0c8c8255ac17d5f898903e9 [diff] |
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