Merge branch 'for-usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sarah...
authorGreg Kroah-Hartman <gregkh@suse.de>
Thu, 1 Dec 2011 19:11:43 +0000 (11:11 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 1 Dec 2011 19:11:52 +0000 (11:11 -0800)
commit8593b6f6b0f05483dc6417b2fb7eb9dfaec34cba
tree6b399a2c771893fafe33c2cd659ae291a5b10ccb
parent307369b0ca06b27b511b61714e335ddfccf19c4f
parent0de13500ad1d8a66b7dc1e7fa517ea15a2625c9e
Merge branch 'for-usb-linus' of git://git./linux/kernel/git/sarah/xhci into usb-linus

* 'for-usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci:
  Revert "xHCI: reset-on-resume quirk for NEC uPD720200"
  xHCI: fix bug in xhci_clear_command_ring()