]> www.infradead.org Git - users/willy/xarray.git/commitdiff
projects / users / willy / xarray.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cf3bbca 57d1337)
Merge branch 'pm-domains'
authorRafael J. Wysocki <rjw@sisk.pl>
Fri, 16 Mar 2012 20:50:08 +0000 (21:50 +0100)
committerRafael J. Wysocki <rjw@sisk.pl>
Fri, 16 Mar 2012 20:50:08 +0000 (21:50 +0100)
* pm-domains:
  PM / shmobile: Make MTU2 driver use pm_genpd_dev_always_on()
  PM / shmobile: Make CMT driver use pm_genpd_dev_always_on()
  PM / shmobile: Make TMU driver use pm_genpd_dev_always_on()
  PM / Domains: Introduce "always on" device flag
  PM / Domains: Fix hibernation restore of devices, v2
  PM / Domains: Fix handling of wakeup devices during system resume

1  2 
arch/arm/mach-shmobile/setup-sh7372.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/mach-shmobile/setup-sh7372.c
Simple merge
XArray, radix tree and IDR