Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Dec 2009 22:22:05 +0000 (14:22 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Dec 2009 22:22:05 +0000 (14:22 -0800)
commit2218a4fcf3cddd076aaf8855f675ce77f74a500b
tree3cd0656eed0d9fbacd71048159ec1ba8a11dd53f
parentfe35d4a0289a8d6efcacb57e9a377b845686df10
parentf1212ae1332b95fe3bafa7b5c063dd8e473247cf
Merge branch 'for-linus' of git://git./linux/kernel/git/rafael/suspend-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
  PM: Runtime PM documentation update
  PM / Runtime: Use device type and device class callbacks
  PM: Use pm_runtime_put_sync in system resume
  PM: Measure device suspend and resume times
  PM: Make the initcall_debug style timing for suspend/resume complete