tree feb760c7e2cdb1e43640417409428ab858910ea3
parent c027a474a68065391c8773f6e83ed5412657e369
parent c3e6088e1036f8084bc7444b38437da136b7588b
author Len Brown <len.brown@intel.com> 1312385442 -0400
committer Len Brown <len.brown@intel.com> 1312385442 -0400

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>