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)
commit54ef3fe6970b040e9b6d1fc7f64f8dcab5cfb743
tree924613494fac61514c0fc806920ed5032f2322a6
parentb03e119fff8a06f55faaaa11c6259829fe81cbb4
parente53b1fd432497942a0fdfd0e89c3d30241cb4d2c
Merge branch 'mvebu/soc-cpuidle' into mvebu/soc

Conflicts:
arch/arm/mach-mvebu/pmsu.c
arch/arm/mach-mvebu/platsmp.c
arch/arm/mach-mvebu/pmsu.c