Merge branch 'pm-fixes' of git://github.com/rjwysocki/linux-pm
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 27 Sep 2011 22:41:32 +0000 (15:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 27 Sep 2011 22:41:32 +0000 (15:41 -0700)
* 'pm-fixes' of git://github.com/rjwysocki/linux-pm:
  PM / Clocks: Do not acquire a mutex under a spinlock


Trivial merge