Merge remote-tracking branch 'lsk/v3.10/topic/arm64-topology' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Tue, 25 Feb 2014 03:20:11 +0000 (12:20 +0900)
committerMark Brown <broonie@linaro.org>
Tue, 25 Feb 2014 03:22:26 +0000 (12:22 +0900)
commit1191dad23b74484e9f900b1d5d42556adb436633
tree47952bb3ab2da2e0e59fc61d42984ee69d817cbc
parent8415e604452966f981f20cb4d8a8a30e38a772dd
parentcc347206daf808c86ced0ce3136313c78f1beeb5
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-topology' into linux-linaro-lsk

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