tree 6b399a2c771893fafe33c2cd659ae291a5b10ccb
parent 307369b0ca06b27b511b61714e335ddfccf19c4f
parent 0de13500ad1d8a66b7dc1e7fa517ea15a2625c9e
author Greg Kroah-Hartman <gregkh@suse.de> 1322766703 -0800
committer Greg Kroah-Hartman <gregkh@suse.de> 1322766712 -0800

Merge branch 'for-usb-linus' of git://git.kernel.org/pub/scm/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()