Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Aug 2011 20:15:25 +0000 (13:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Aug 2011 20:15:25 +0000 (13:15 -0700)
* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PM / Domains: Fix build for CONFIG_PM_RUNTIME unset


Trivial merge