Merge branch 'pm-fixes' into pm-domains
authorRafael J. Wysocki <rjw@sisk.pl>
Mon, 26 Sep 2011 18:12:45 +0000 (20:12 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Mon, 26 Sep 2011 18:12:45 +0000 (20:12 +0200)
commit0d41da2e31e81f5c8aaabe17f769de4304b2d4c8
tree540acefba9bf01d3880d7bacb767fbf9b1fe80b4
parenta0089bd617adea27ebc352e1e0871649ab1dbaa6
parente8b364b88cc4001b21c28c1ecf1e1e3ffbe162e6
Merge branch 'pm-fixes' into pm-domains

Merge commit e8b364b88cc4001b21c28c1ecf1e1e3ffbe162e6
(PM / Clocks: Do not acquire a mutex under a spinlock) fixing
a regression in drivers/base/power/clock_ops.c.

Conflicts:
drivers/base/power/clock_ops.c
arch/arm/mach-shmobile/board-ap4evb.c
arch/arm/mach-shmobile/board-mackerel.c
arch/arm/mach-shmobile/include/mach/sh7372.h
arch/arm/mach-shmobile/setup-sh7372.c
drivers/base/power/clock_ops.c