Commit d0e323b4 authored 13 years ago by Len Brown

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>

parents c027a474 c3e6088e

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing with 116 additions and 32 deletions

Please register or to comment