Merge branch 'for-lsk' of git://git.linaro.org/arm/big.LITTLE/mp into lsk-v3.10-big...
authorMark Brown <broonie@linaro.org>
Wed, 22 Jan 2014 12:33:23 +0000 (12:33 +0000)
committerMark Brown <broonie@linaro.org>
Wed, 22 Jan 2014 12:33:23 +0000 (12:33 +0000)
Conflicts:
kernel/irq/irqdesc.c
linaro/configs/big-LITTLE-MP.conf


Trivial merge