Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6

Browse source

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

...

This commit is contained in:

Linus Torvalds 2011-03-18 22:31:54 -07:00

parent 2c1d2470c0 e1620d591a

commit 26b95cac5f

3 changed files with 11 additions and 12 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

15

drivers/usb/core/driver.c

View file

5

drivers/usb/core/usb.c

View file

3

drivers/usb/core/usb.h

View file