From: H. Peter Anvin <hpa@linux.intel.com>
Date: Mon, 11 Aug 2014 20:58:54 +0000 (-0700)
Subject: Merge tag 'efi-urgent' into x86/efi
X-Git-Tag: cleanup-for-v3.18~38^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e13bcf7e0981f1db0c8c8255ac17d5f898903e9;p=pandora-kernel.git

Merge tag 'efi-urgent' into x86/efi

 * Enforce CONFIG_RELOCATABLE for the x86 EFI boot stub, otherwise
   it's possible to overwrite random pieces of unallocated memory during
   kernel decompression, leading to machine resets.

Resolved Conflicts:
	arch/x86/Kconfig

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
---

9e13bcf7e0981f1db0c8c8255ac17d5f898903e9
Reading git-diff-tree failed