From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 14 Aug 2014 00:21:35 +0000 (-0600)
Subject: Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~176^2~3404
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d27c0d90184a13e9e9f28c38e84f889a259f6b5f;p=firefly-linux-kernel-4.4.55.git

Merge branch 'x86-efi-for-linus' of git://git./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
---

d27c0d90184a13e9e9f28c38e84f889a259f6b5f