Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Sat, 24 May 2014 13:11:01 +0000 (14:11 +0100)
committerMark Brown <broonie@linaro.org>
Sat, 24 May 2014 13:11:01 +0000 (14:11 +0100)
commit088d7dadf9ce9e4923355f1e9ad02cd130dcfd7e
treeee42a16e469e3a19ae1e62b29c44fbcb3c25a937
parent244df97e7a9f8a3919c8684c061c565fe0f55f1d
parent8b343c860c2eb637c24ca77dec244d1f1a7560a6
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk

Conflicts:
arch/arm64/Kconfig
arch/arm64/Kconfig
arch/arm64/include/asm/pgtable.h
arch/arm64/kernel/head.S
arch/arm64/kernel/setup.c