projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c027a47 c3e6088)
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)
commitd0e323b47057f4492b8fa22345f38d80a469bf8d
treefeb760c7e2cdb1e43640417409428ab858910ea3tree | snapshot (tar.gz zip)
parentc027a474a68065391c8773f6e83ed5412657e369commit | diff
parentc3e6088e1036f8084bc7444b38437da136b7588bcommit | 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