Merge tag 'efi-urgent' into x86/urgent
authorH. Peter Anvin <hpa@linux.intel.com>
Tue, 4 Mar 2014 23:49:59 +0000 (15:49 -0800)
committerH. Peter Anvin <hpa@linux.intel.com>
Tue, 4 Mar 2014 23:50:06 +0000 (15:50 -0800)
commit3c0b566334c9942c89927bd1b5ad2f32baab81fa
tree2dac7217b98b7aa3f13f8213932f678e7b4fede7
parent0414855fdc4a40da05221fc6062cccbc0c30f169
parenta5d90c923bcfb9632d998ed06e9569216ad695f3
Merge tag 'efi-urgent' into x86/urgent

 * Disable the new EFI 1:1 virtual mapping for SGI UV because using it
   causes a crash during boot - Borislav Petkov

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