| commit | d2d8f66bb991757e360728da77920e18bd678767 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Oct 26 17:31:05 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Oct 26 17:31:05 2010 -0700 |
| tree | 35153633d38767991410013d2acd354c80bc0aec | |
| parent | 474829e875ab93512dbe0a713f564d3cd3874bc9 [diff] | |
| parent | d63be5f924cf054e7ac18bb2761f9533039fb076 [diff] |
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 * 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: PM / Runtime: fix recursive locking warning of lockdep from rpm_resume()