Merge branch 'for-usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sarah...
authorGreg Kroah-Hartman <gregkh@suse.de>
Tue, 24 Jan 2012 18:56:07 +0000 (10:56 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 24 Jan 2012 18:56:15 +0000 (10:56 -0800)
* 'for-usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci:
  xhci: Fix USB 3.0 device restart on resume.


Trivial merge