]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge tag 'efi-urgent' into x86/urgent
authorH. Peter Anvin <hpa@linux.intel.com>
Fri, 7 Feb 2014 19:27:30 +0000 (11:27 -0800)
committerH. Peter Anvin <hpa@linux.intel.com>
Fri, 7 Feb 2014 19:27:30 +0000 (11:27 -0800)
 * Avoid WARN_ON() when mapping BGRT on Baytrail (EFI 32-bit).

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
1  2 
arch/x86/Kconfig
arch/x86/mm/srat.c
include/linux/vmstat.h
lib/Makefile

Simple merge
Simple merge
Simple merge
diff --cc lib/Makefile
Simple merge