Merge remote-tracking branch 'lsk/v3.10/topic/arm64-cpuidle' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Fri, 30 May 2014 10:14:13 +0000 (11:14 +0100)
committerMark Brown <broonie@linaro.org>
Fri, 30 May 2014 10:14:13 +0000 (11:14 +0100)
commit6fe70bb73ef2fa814d88220c38f2ca07342aea75
treee772b0d8ffeb0f982beba4b51ae5d12a659a95f5
parentef4190081aa143c0399bd7b3da872fdd72024010
parentce2bf4a89734e34022800b122f320186e35b188e
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-cpuidle' into linux-linaro-lsk

Conflicts:
drivers/cpuidle/Makefile
arch/arm64/boot/dts/rtsm_ve-aemv8a.dts
drivers/cpuidle/Makefile