Merge remote-tracking branch 'lsk/v3.10/topic/arm64-cpu' into lsk-v3.10-arm64-misc
authorMark Brown <broonie@linaro.org>
Fri, 16 May 2014 14:36:15 +0000 (15:36 +0100)
committerMark Brown <broonie@linaro.org>
Fri, 16 May 2014 14:36:15 +0000 (15:36 +0100)
commit6b8b8223b534f121c546d3f9d1605ee75fac1f85
treede491e6290b3b7308ff075e5b451e4ce0175dd6f
parent8751cf9a6c5f5bf02a2de8a4c025e09b38556df4
parent5066e800ba3438724f7541c284d674acd9909ba6
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-cpu' into lsk-v3.10-arm64-misc

Conflicts:
arch/arm64/kernel/smp.c
arch/arm64/Kconfig
arch/arm64/kernel/head.S
arch/arm64/kernel/process.c
arch/arm64/kernel/setup.c
arch/arm64/kernel/smp.c
arch/arm64/kernel/vmlinux.lds.S