Merge remote-tracking branch 'lsk/v3.10/topic/arm64-topology' into lsk-v3.10-arm64-hmp
authorMark Brown <broonie@linaro.org>
Fri, 9 May 2014 21:09:24 +0000 (22:09 +0100)
committerMark Brown <broonie@linaro.org>
Fri, 9 May 2014 21:27:03 +0000 (22:27 +0100)
commitee22524dbe4fcbaa8186296d197e73982a935565
tree3a30ec09b61048bdea28845126e897446c82f258
parent8ecd48091c61213762407f5ce02d3fa4ede66402
parenta84034fddb11f30849dd7ce050689d615995c0d2
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-topology' into lsk-v3.10-arm64-hmp

Conflicts:
arch/arm64/Kconfig
arch/arm64/include/asm/topology.h
arch/arm64/kernel/smp.c
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