| commit | 26b95cac5fddb2916e2cef76495073f9c37a7b54 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Mar 18 22:31:54 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Mar 18 22:31:54 2011 -0700 |
| tree | de175be25825e178d8516cd0eedd29eddfaff2cf | |
| parent | 2c1d2470c0c0992fae2cc0e04921f9e02a670a00 [diff] | |
| parent | e1620d591a75a10b15cf61dbf8243a0b7e6731a2 [diff] |
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