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)
commit2305009118181260b45aab82f14bcbb659953ef1
tree0c2c9469d7ae37f38449116971bf16b10355e19c
parent0e9b1909c3c660060d94a0a8a15c5299de97a4aa
parentb30814c74c184bbb231e24d6c857699af338468b
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