tree 9f27a6a7d8def97721d6a8ad0a9c5c008bee7360
parent 06f11f37aa84e83b48cdf36037c4414f5a83c13f
parent 9cebcdc7fb10d478b22d7125b215cee3b9ea82f2
author Linus Torvalds <torvalds@linux-foundation.org> 1207176978 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1207176978 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
  USB: ohci: fix 2 timers to fire at jiffies + 1s
  USB: Allow initialization of broken keyspan serial adapters.
  USB: fix bug in sg initialization in usbtest
  USB: serial: fix regression in Visor/Palm OS module for kernels >= 2.6.24
  USB: cp2101: Add identifiers for the Telegesys ETRX2USB
  USB: serial: ti_usb_3410_5052: Correct TUSB3410 endpoint requirements.
  USB: another ehci_iaa_watchdog fix