Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk
authorMark Brown <broonie@kernel.org>
Fri, 16 Jan 2015 22:50:34 +0000 (22:50 +0000)
committerMark Brown <broonie@kernel.org>
Sat, 17 Jan 2015 01:23:42 +0000 (01:23 +0000)
commitd1f7a4c0bfda09bebb1948e2169a6ce6a7319bd3
tree872faf5dcd234e04025a526e83e867a7855cb9b7
parentc293f79246d7cdaf6e75b40aa1f957eb8d195835
parentc0131386abdafa081356c1c02129df6413e685e0
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk

Conflicts:
arch/arm/include/asm/psci.h
arch/arm/kernel/psci.c
arch/arm/kernel/psci_smp.c
arch/arm/kernel/setup.c
arch/arm64/Kconfig
arch/arm64/include/asm/cpu_ops.h
arch/arm64/include/asm/pgtable.h
arch/arm64/include/asm/psci.h
arch/arm64/kernel/head.S
arch/arm64/kernel/psci.c
arch/arm64/kernel/ptrace.c
16 files changed:
arch/arm/include/asm/psci.h
arch/arm/kernel/psci.c
arch/arm/kernel/psci_smp.c
arch/arm/kernel/setup.c
arch/arm64/Kconfig
arch/arm64/include/asm/cpu_ops.h
arch/arm64/include/asm/processor.h
arch/arm64/kernel/arm64ksyms.c
arch/arm64/kernel/head.S
arch/arm64/kernel/process.c
arch/arm64/kernel/psci.c
arch/arm64/kernel/ptrace.c
arch/arm64/kernel/smp.c
arch/arm64/kernel/time.c
arch/arm64/mm/proc.S
arch/x86/kernel/reboot.c