git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 75a1ba5 081cd62)

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	a3b072cd180c12e8fe0ece9487b9065808327640
tree	62b982041be84748852d77cdf6ca5639ef40858f	tree \| snapshot
parent	75a1ba5b2c529db60ca49626bcaf0bddf4548438	commit \| diff
parent	081cd62a010f97b5bc1d2b0cd123c5abc692b68a	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

John Crispins staging tree