From: Rafael J. Wysocki <rjw@sisk.pl>
Date: Mon, 26 Sep 2011 18:12:45 +0000 (+0200)
Subject: Merge branch 'pm-fixes' into pm-domains
X-Git-Tag: v3.2-rc1~178^2~23^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d41da2e31e81f5c8aaabe17f769de4304b2d4c8;p=pandora-kernel.git

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

0d41da2e31e81f5c8aaabe17f769de4304b2d4c8
Reading git-diff-tree failed