Merge branch 'mvebu/soc-cpuidle' into mvebu/soc
authorJason Cooper <jason@lakedaemon.net>
Thu, 24 Jul 2014 23:10:02 +0000 (23:10 +0000)
committerJason Cooper <jason@lakedaemon.net>
Thu, 24 Jul 2014 23:10:02 +0000 (23:10 +0000)
Conflicts:
arch/arm/mach-mvebu/pmsu.c


Trivial merge