From: Rafael J. Wysocki <rjw@sisk.pl>
Date: Sun, 4 Mar 2012 22:11:20 +0000 (+0100)
Subject: Merge branch 'pm-domains'
X-Git-Tag: v3.4-rc1~173^2~6
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=48ed00031681c373ff81e78fd248710fe4cddda0;p=~emulex%2Finfiniband.git

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
---

48ed00031681c373ff81e78fd248710fe4cddda0