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)
commitaf5c5805013d3c97d7f0bc27a56c49baa34b1f8a
treea733b26db5ea6766d47322b306bca3119ac1335f
parent97f93227e646741adf4d7cbf4baf7a087746e93a
parent3abeca998a44205cfd837fa0bf1f7c24f8294acb
Merge branch 'for-usb-next' of git+ssh:///linux/kernel/git/sarah/xhci into usb-next

* 'for-usb-next' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/sarah/xhci:
  xhci: Fix bug in control transfer cancellation.