From: Linus Torvalds Date: Sat, 19 Mar 2011 05:31:54 +0000 (-0700) Subject: Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspe... X-Git-Tag: v2.6.39-rc1~413 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=26b95cac5fddb2916e2cef76495073f9c37a7b54;p=linux-block.git 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 --- 26b95cac5fddb2916e2cef76495073f9c37a7b54