Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Wed, 21 May 2014 23:13:20 +0000 (00:13 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 21 May 2014 23:13:20 +0000 (00:13 +0100)
commitfb64c4d995f8ed48e1b3ba95f64c6c52c199cd41
tree93b09942e9327d065db1b7d70aaf4900cbd03a95
parent2a9c8004701ab3f31758bf919d6f1fa027bbe280
parenta99a4e55f652f72dc736935a795936b65c47a17f
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk

Conflicts:
arch/arm64/kernel/debug-monitors.c
arch/arm64/mm/dma-mapping.c
13 files changed:
arch/arm64/Kconfig
arch/arm64/include/asm/cacheflush.h
arch/arm64/include/asm/cmpxchg.h
arch/arm64/include/asm/virt.h
arch/arm64/kernel/debug-monitors.c
arch/arm64/kernel/head.S
arch/arm64/kernel/process.c
arch/arm64/kernel/setup.c
arch/arm64/kernel/smp.c
arch/arm64/kernel/smp_spin_table.c
arch/arm64/kernel/vdso.c
arch/arm64/mm/cache.S
arch/arm64/mm/proc.S