From: Rafael J. Wysocki <rjw@sisk.pl>
Date: Mon, 8 Aug 2011 21:45:51 +0000 (+0200)
Subject: Merge branch 'pm-domains' into linux-next
X-Git-Tag: next-20110809~14^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=94b05d6fb11d456d4154379089a40ef3492b256f;p=karo-tx-linux.git

Merge branch 'pm-domains' into linux-next

* pm-domains:
  ARM / shmobile: Make A3RV be a subdomain of A4LC on SH7372
  PM / Domains: Rename argument of pm_genpd_add_subdomain()
  PM / Domains: Rename GPD_STATE_WAIT_PARENT to GPD_STATE_WAIT_MASTER
  PM / Domains: Allow generic PM domains to have multiple masters
  PM / Domains: Add "wait for parent" status for generic PM domains
  PM / Domains: Make pm_genpd_poweron() always survive parent removal
  PM / Domains: Do not take parent locks to modify subdomain counters
  PM / Domains: Implement subdomain counters as atomic fields
---

94b05d6fb11d456d4154379089a40ef3492b256f