git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: daee882 964f304)

author	H. Peter Anvin <hpa@linux.intel.com>
	Fri, 7 Feb 2014 19:27:30 +0000 (11:27 -0800)
committer	H. Peter Anvin <hpa@linux.intel.com>
	Fri, 7 Feb 2014 19:27:30 +0000 (11:27 -0800)
commit	9c91059a73f28769de0fde3ccdb796613403fa17
tree	62b982041be84748852d77cdf6ca5639ef40858f	tree \| snapshot
parent	daee882512a12aec98bdf3b367530b80d110cf9e	commit \| diff
parent	964f304fbdd2002bca975bf1e8640abdec35ae8f	commit \| diff

Merge tag 'efi-urgent' into x86/urgent

* Avoid WARN_ON() when mapping BGRT on Baytrail (EFI 32-bit).

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

arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/srat.c	diff1 \|	diff2 \|	blob \| history
include/linux/vmstat.h	diff1 \|	diff2 \|	blob \| history
lib/Makefile	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.