Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Thu, 24 Jul 2014 21:52:37 +0000 (22:52 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 24 Jul 2014 21:52:37 +0000 (22:52 +0100)
commitbf3738e51576cd0cd8c59ef611734cc423323563
treec6a359bc66479692f69124dff81dcf6313d27517
parenta44e5e7cf580307809147cbec3d326e77524f757
parent20f2b5cafcd9af698faa789daccc55c7062dcc68
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk

Conflicts:
arch/arm64/kernel/head.S
arch/arm64/include/asm/memory.h
arch/arm64/include/asm/pgtable.h
arch/arm64/kernel/head.S
arch/arm64/kernel/vdso.c
arch/arm64/mm/mmu.c