| commit | 0d41da2e31e81f5c8aaabe17f769de4304b2d4c8 | [log] [tgz] |
|---|---|---|
| author | Rafael J. Wysocki <rjw@sisk.pl> | Mon Sep 26 20:12:45 2011 +0200 |
| committer | Rafael J. Wysocki <rjw@sisk.pl> | Mon Sep 26 20:12:45 2011 +0200 |
| tree | 540acefba9bf01d3880d7bacb767fbf9b1fe80b4 | |
| parent | a0089bd617adea27ebc352e1e0871649ab1dbaa6 [diff] | |
| parent | e8b364b88cc4001b21c28c1ecf1e1e3ffbe162e6 [diff] |
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