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)
commit57119327df3a824dc9a59973d3db7e5bdd2e75cc
treec3e61cca6fe29bf9b23e8aa7a7af64fcb5f1a6a3
parentb6c8069d3577481390b3f24a8434ad72a3235594
parente8b364b88cc4001b21c28c1ecf1e1e3ffbe162e6
Merge branch 'pm-fixes' of git://github.com/rjwysocki/linux-pm

* 'pm-fixes' of git://github.com/rjwysocki/linux-pm:
  PM / Clocks: Do not acquire a mutex under a spinlock