From: Rafael J. Wysocki Date: Mon, 26 Sep 2011 18:37:53 +0000 (+0200) Subject: Merge branch 'pm-domains' into pm-test X-Git-Tag: next-20110927~28^2~2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1a588016928ea232bbe21b6fe6c5676b1a38040b;p=karo-tx-linux.git Merge branch 'pm-domains' into pm-test * pm-domains: PM / Domains: Split device PM domain data into base and need_restore ARM: mach-shmobile: sh7372 sleep warning fixes ARM: mach-shmobile: sh7372 A3SM support ARM: mach-shmobile: sh7372 generic suspend/resume support PM / Domains: Preliminary support for devices with power.irq_safe set PM: Move clock-related definitions and headers to separate file PM / Domains: Use power.sybsys_data to reduce overhead PM: Reference counting of power.subsys_data PM: Introduce struct pm_subsys_data 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 --- 1a588016928ea232bbe21b6fe6c5676b1a38040b