]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8177563 fa6cd49)
Merge branch 'apei' into apei-release
authorLen Brown <len.brown@intel.com>
Wed, 3 Aug 2011 15:30:42 +0000 (11:30 -0400)
committerLen Brown <len.brown@intel.com>
Wed, 3 Aug 2011 15:30:42 +0000 (11:30 -0400)
commit1e5116921ebf7e878d052d2440507c1479c0e427
treefeb760c7e2cdb1e43640417409428ab858910ea3tree | snapshot
parent81775635ea288d6818170cb1b0cf79017aaa5aefcommit | diff
parentfa6cd49141e9c694e4ad769d8f2e56fec2132b59commit | diff
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>
13 files changed:
arch/alpha/Kconfig diff1 | diff2 | blob | history
arch/ia64/Kconfig diff1 | diff2 | blob | history
arch/m68k/Kconfig diff1 | diff2 | blob | history
arch/powerpc/Kconfig diff1 | diff2 | blob | history
arch/sh/Kconfig diff1 | diff2 | blob | history
arch/sparc/Kconfig diff1 | diff2 | blob | history
arch/x86/Kconfig diff1 | diff2 | blob | history
drivers/acpi/apei/erst.c diff1 | diff2 | blob | history
include/linux/bitmap.h diff1 | diff2 | blob | history
include/linux/mm.h diff1 | diff2 | blob | history
lib/Kconfig diff1 | diff2 | blob | history
lib/Makefile diff1 | diff2 | blob | history
lib/bitmap.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.