Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspe...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 19 Mar 2011 05:31:54 +0000 (22:31 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 19 Mar 2011 05:31:54 +0000 (22:31 -0700)
commit26b95cac5fddb2916e2cef76495073f9c37a7b54
treede175be25825e178d8516cd0eedd29eddfaff2cf
parent2c1d2470c0c0992fae2cc0e04921f9e02a670a00
parente1620d591a75a10b15cf61dbf8243a0b7e6731a2
Merge branch 'pm-fixes' of git://git./linux/kernel/git/rafael/suspend-2.6

* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
  USB: Move runtime PM callbacks to usb_device_pm_ops