Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Thu, 15 May 2014 19:29:29 +0000 (20:29 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 15 May 2014 19:29:29 +0000 (20:29 +0100)
commita5d53ad243dc3178fa9001d8ab1f19c63f8debd5
tree0139239f56b2dea497a003b4512a4ba849591306
parent15fdd2469e03d44975d548a73e689a725e76a5ee
parent8751cf9a6c5f5bf02a2de8a4c025e09b38556df4
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk

Conflicts:
Documentation/arm64/tagged-pointers.txt
arch/arm64/Kconfig
arch/arm64/boot/dts/Makefile
arch/arm64/include/asm/arch_timer.h
arch/arm64/include/asm/elf.h
arch/arm64/include/asm/spinlock.h
arch/arm64/kernel/smp.c
25 files changed:
arch/arm/include/asm/elf.h
arch/arm/mm/init.c
arch/arm64/Kconfig
arch/arm64/Makefile
arch/arm64/boot/dts/Makefile
arch/arm64/configs/defconfig
arch/arm64/include/asm/cacheflush.h
arch/arm64/include/asm/cmpxchg.h
arch/arm64/include/asm/cputype.h
arch/arm64/include/asm/elf.h
arch/arm64/include/asm/hwcap.h
arch/arm64/include/asm/ptrace.h
arch/arm64/kernel/head.S
arch/arm64/kernel/kuser32.S
arch/arm64/kernel/process.c
arch/arm64/kernel/ptrace.c
arch/arm64/kernel/setup.c
arch/arm64/kernel/signal32.c
arch/arm64/kernel/smp.c
arch/arm64/kernel/vmlinux.lds.S
arch/arm64/mm/init.c
arch/arm64/mm/proc.S
arch/powerpc/kernel/prom.c
arch/xtensa/kernel/setup.c
drivers/of/fdt.c