Merge branch 'arm64/unstable/arm64-cpuidle' of git://linux-arm.org/linux-2.6-lp into...
authorSudeep Holla <sudeep.holla@arm.com>
Wed, 4 Jun 2014 15:01:29 +0000 (16:01 +0100)
committerSudeep Holla <sudeep.holla@arm.com>
Wed, 4 Jun 2014 15:01:29 +0000 (16:01 +0100)
* 'arm64/unstable/arm64-cpuidle' of git://linux-arm.org/linux-2.6-lp:
  arm64: boot: dts: update rtsm aemv8 dts with PSCI and idle states
  drivers: cpuidle: CPU idle ARM64 driver
  arm64: add PSCI CPU_SUSPEND based cpu_suspend support
  drivers: cpuidle: implement OF based idle states infrastructure


Trivial merge