Merge branch 'pm-domains'
authorRafael J. Wysocki <rjw@sisk.pl>
Sun, 4 Mar 2012 22:11:20 +0000 (23:11 +0100)
committerRafael J. Wysocki <rjw@sisk.pl>
Sun, 4 Mar 2012 22:11:20 +0000 (23:11 +0100)
commit48ed00031681c373ff81e78fd248710fe4cddda0
treedd90809d6017924ee528114a4205ab8cfd8422af
parent643161ace2a7624fd0106ede12ae43bcbbfc1de0
parentb642631d38c28fefd1232a6b96713eb54b60130d
Merge branch 'pm-domains'

* pm-domains:
  PM / Domains: Fix include for PM_GENERIC_DOMAINS=n case
  PM / Domains: Provide a dummy dev_gpd_data() when generic domains are not used
  PM / Domains: Run late/early device suspend callbacks at the right time
  ARM: EXYNOS: Hook up power domains to generic power domain infrastructure
  PM / Domains: Add OF support
arch/arm/mach-exynos/mach-nuri.c
arch/arm/mach-exynos/mach-universal_c210.c