Merge branch 'for-usb-next' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git...
authorGreg Kroah-Hartman <gregkh@suse.de>
Thu, 12 May 2011 16:39:22 +0000 (09:39 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 12 May 2011 16:39:31 +0000 (09:39 -0700)
* 'for-usb-next' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/sarah/xhci:
  xhci: Fix bug in control transfer cancellation.


Trivial merge