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)
* '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


Trivial merge