Merge remote-tracking branch 'lsk/v3.10/topic/arm64-topology' into linux-linaro-lsk

author Mark Brown <broonie@linaro.org>

Wed, 11 Dec 2013 22:36:52 +0000 (22:36 +0000)

committer Mark Brown <broonie@linaro.org>

Wed, 11 Dec 2013 22:36:52 +0000 (22:36 +0000)
author Mark Brown <broonie@linaro.org>
Wed, 11 Dec 2013 22:36:52 +0000 (22:36 +0000)
committer Mark Brown <broonie@linaro.org>
Wed, 11 Dec 2013 22:36:52 +0000 (22:36 +0000)
diff --cc arch/arm64/Kconfig
Simple merge
diff --cc arch/arm64/kernel/smp.c
Simple merge
diff --cc drivers/of/base.c
Simple merge
author	Mark Brown <broonie@linaro.org>
	Wed, 11 Dec 2013 22:36:52 +0000 (22:36 +0000)
committer	Mark Brown <broonie@linaro.org>
	Wed, 11 Dec 2013 22:36:52 +0000 (22:36 +0000)
		1	2
arch/arm64/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/smp.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/of/base.c	patch \|	diff1 \|	diff2 \|	blob \| history