From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Wed, 16 Oct 2013 22:13:39 +0000 (+0200)
Subject: Merge branch 'cpuidle/arm-next' of git://git.linaro.org/people/dlezcano/linux into... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=80b1ce57803e52cf061a3a18e6f7f121491722b2;p=linux-beck.git

Merge branch 'cpuidle/arm-next' of git://git.linaro.org/people/dlezcano/linux into pm-cpuidle

Pull cpuidle updates for v3.13 from Daniel Lezcano:

 - Daniel Lezcano converted cpuidle to a platform_driver for at91.
   The standby callback is stored in the platform_device's data
   field as a callback for the driver, so the pm specific code and
   the backend driver have no more dependency. Each SoC init function
   fills the right callback at init time. As there are no more
   dependency, we can move the driver in the drivers/cpuidle directory.

 - Jean-Christophe Plagnol-Villard and Nicolas Ferre made a cleanup on
   top of the patch described above and fixed up the ddr standby callback
   so more SoC are supported. Even if the modifications are in the
   mach-at91 directory, they asked these patches to be included through
   the PM tree as they depend on the platform_driver conversion.

* 'cpuidle/arm-next' of git://git.linaro.org/people/dlezcano/linux:
  ARM: AT91: DT: pm: Select ram controller standby based on DT
  ARM: AT91: pm: Factorize standby function
  ARM: at91: cpuidle: Move driver to drivers/cpuidle
  ARM: at91: cpuidle: Convert to platform driver
---

80b1ce57803e52cf061a3a18e6f7f121491722b2