| commit | b4fd4ae6c6420c18e4bae2c294b7e06f5ff5210f | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Wed, 17 Aug 2011 20:15:25 +0000 (17 13:15 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Wed, 17 Aug 2011 20:15:25 +0000 (17 13:15 -0700) | ||
| tree | a948e1f99dbce5d34da04b3e655d3655335848d7 | treesnapshot (tar.gz zip) |
| parent | aa462abe8aaf2198d6aef97da20c874ac694a39f | commitdiff |
| parent | 17f2ae7f677f023997e02fd2ebabd90ea2a0390d | commitdiff |
Merge branch 'pm-fixes' of git://git./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
* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
PM / Domains: Fix build for CONFIG_PM_RUNTIME unset