tree a948e1f99dbce5d34da04b3e655d3655335848d7
parent aa462abe8aaf2198d6aef97da20c874ac694a39f
parent 17f2ae7f677f023997e02fd2ebabd90ea2a0390d
author Linus Torvalds <torvalds@linux-foundation.org> 1313612125 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1313612125 -0700

Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PM / Domains: Fix build for CONFIG_PM_RUNTIME unset