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


Trivial merge