From: Linus Torvalds Date: Wed, 2 Apr 2008 22:56:18 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 X-Git-Tag: v3.12-rc1~22152 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9597362d354f8655ece324b01d0c640a0e99c077;p=kernel%2Fkernel-generic.git Merge git://git./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 --- 9597362d354f8655ece324b01d0c640a0e99c077