Merge remote-tracking branch 'lsk/v3.10/topic/arm64-hmp' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Fri, 9 May 2014 21:57:02 +0000 (22:57 +0100)
committerMark Brown <broonie@linaro.org>
Fri, 9 May 2014 21:57:02 +0000 (22:57 +0100)
commitcd4c4a096c14dece853de1e1bdc6b5d1fa1928e8
treeeb94a24e55de518e18d015d8ac18c9baea2d5040
parent40e58abd6b5fb847c0701bc789b35f6f65448366
parentee22524dbe4fcbaa8186296d197e73982a935565
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-hmp' into linux-linaro-lsk

Conflicts:
arch/arm64/kernel/Makefile
arch/arm64/kernel/topology.c
arch/arm64/Kconfig
arch/arm64/include/asm/topology.h
arch/arm64/kernel/Makefile
arch/arm64/kernel/smp.c
arch/arm64/kernel/topology.c