From: Len Brown <len.brown@intel.com>
Date: Wed, 3 Aug 2011 15:30:42 +0000 (-0400)
Subject: Merge branch 'apei' into apei-release
X-Git-Tag: v3.1-rc1~40^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0e323b47057f4492b8fa22345f38d80a469bf8d;p=pandora-kernel.git

Merge branch 'apei' into apei-release

Some trivial conflicts due to other various merges
adding to the end of common lists sooner than this one.

	arch/ia64/Kconfig
	arch/powerpc/Kconfig
	arch/x86/Kconfig
	lib/Kconfig
	lib/Makefile

Signed-off-by: Len Brown <len.brown@intel.com>
---

d0e323b47057f4492b8fa22345f38d80a469bf8d
Reading git-diff-tree failed