From: Mark Brown <broonie@linaro.org>
Date: Wed, 22 Jan 2014 12:33:23 +0000 (+0000)
Subject: Merge branch 'for-lsk' of git://git.linaro.org/arm/big.LITTLE/mp into lsk-v3.10-big... 
X-Git-Tag: firefly_0821_release~3680^2~5^2~3^2~8
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2305009118181260b45aab82f14bcbb659953ef1;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-lsk' of git://git.linaro.org/arm/big.LITTLE/mp into lsk-v3.10-big.LITTLE

Conflicts:
	kernel/irq/irqdesc.c
	linaro/configs/big-LITTLE-MP.conf
---

2305009118181260b45aab82f14bcbb659953ef1