tree de175be25825e178d8516cd0eedd29eddfaff2cf
parent 2c1d2470c0c0992fae2cc0e04921f9e02a670a00
parent e1620d591a75a10b15cf61dbf8243a0b7e6731a2
author Linus Torvalds <torvalds@linux-foundation.org> 1300512714 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1300512714 -0700

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:
  USB: Move runtime PM callbacks to usb_device_pm_ops