Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 7 Mar 2010 23:45:35 +0000 (15:45 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 7 Mar 2010 23:45:35 +0000 (15:45 -0800)
commit5980bb3ee6e733d66eea04c221a140dea15d52de
tree5365854f6fc7db6cc2d6a5cfc605942058c7a76a
parent68ae6b5cc1e8b88754a64140b88e467e02abfea2
parentd690b2cd222afc75320b9b8e9da7df02e9e630ca
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: Provide generic subsystem-level callbacks
  PM / Runtime: Document power.runtime_auto and related functions