Merge remote-tracking branch 'lsk/v3.10/topic/big.LITTLE' into linux-linaro-lsk

author Mark Brown <broonie@linaro.org>

Thu, 21 Nov 2013 11:59:02 +0000 (11:59 +0000)

committer Mark Brown <broonie@linaro.org>

Thu, 21 Nov 2013 11:59:02 +0000 (11:59 +0000)
author Mark Brown <broonie@linaro.org>
Thu, 21 Nov 2013 11:59:02 +0000 (11:59 +0000)
committer Mark Brown <broonie@linaro.org>
Thu, 21 Nov 2013 11:59:02 +0000 (11:59 +0000)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc kernel/sched/fair.c
Simple merge
author	Mark Brown <broonie@linaro.org>
	Thu, 21 Nov 2013 11:59:02 +0000 (11:59 +0000)
committer	Mark Brown <broonie@linaro.org>
	Thu, 21 Nov 2013 11:59:02 +0000 (11:59 +0000)
		1	2
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/sched/fair.c	patch \|	diff1 \|	diff2 \|	blob \| history