Merge remote-tracking branch 'lsk/v3.10/topic/arm64-efi' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Thu, 24 Jul 2014 22:03:21 +0000 (23:03 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 24 Jul 2014 22:03:21 +0000 (23:03 +0100)
commitc69294e957dd173809ec7815231e6aff6d5c2d83
treece9801ec11db70553ed55a4c58eb95a22af6cefc
parentbcddae4453f74e9d1dbc8db78c5c9bc552c600cb
parent2edcb9f57bdaef4d4dc3f0f13c3a2b320b07fdf7
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-efi' into linux-linaro-lsk

Conflicts:
arch/arm64/kernel/Makefile
arch/arm64/kernel/head.S
arch/arm64/Kconfig
arch/arm64/kernel/Makefile
arch/arm64/kernel/head.S
arch/arm64/kernel/setup.c
arch/x86/boot/compressed/eboot.c
arch/x86/kernel/setup.c
arch/x86/platform/efi/efi.c