]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f07d2c2 2d11f16)
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)
commit4b1bb7df21a14458a9030f7a3f253727108048a6
treefeb760c7e2cdb1e43640417409428ab858910ea3tree | snapshot
parentf07d2c28148f18e2b1eff3a3abc36d8c07e0160bcommit | diff
parent2d11f164be16a1b99a13bbbc7376758e8b478692commit | 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.