Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk
authorMark Brown <broonie@kernel.org>
Fri, 23 Jan 2015 20:36:05 +0000 (20:36 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 23 Jan 2015 20:36:05 +0000 (20:36 +0000)
commit15f82fce54b86e159fe5a1d41dcdc89e12b26459
treec42632581244e8428e0623c5f11cd81b983d2eed
parentf1326e0892329b0d58dec467f71f5d94c4d5d5a9
parent9698ac7c353d6f22100c9fa24a830cae6a466cb4
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk

Conflicts:
arch/arm64/include/asm/proc-fns.h
arch/arm64/kernel/debug-monitors.c
arch/arm64/kernel/psci.c
12 files changed:
arch/arm64/Kconfig
arch/arm64/Makefile
arch/arm64/include/asm/cputype.h
arch/arm64/include/asm/proc-fns.h
arch/arm64/include/asm/processor.h
arch/arm64/include/asm/thread_info.h
arch/arm64/kernel/head.S
arch/arm64/kernel/process.c
arch/arm64/kernel/psci.c
arch/arm64/kernel/ptrace.c
arch/arm64/kernel/stacktrace.c
arch/arm64/mm/proc.S