tree eb7387b6d26f8f3550d99b1d9b77ebce818e5657
parent 710ad849ae76bc2f938a885e928b90cdbbe61a6e
parent cf7fdd57f978d40ceb9a0f58a25f5cf9c84d6f33
author Linus Torvalds <torvalds@linux-foundation.org> 1249697196 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1249697196 -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: fix oops on disconnect in cdc-acm
  USB: storage: include Prolific Technology USB drive in unusual_devs list
  USB: ftdi_sio: add product_id for Marvell OpenRD Base, Client
  USB: ftdi_sio: add vendor and product id for Bayer glucose meter serial converter cable
  USB: EHCI: fix counting of transaction error retries
  USB: EHCI: fix two new bugs related to Clear-TT-Buffer
  USB: usbfs: fix -ENOENT error code to be -ENODEV
  USB: musb: fix the nop registration for OMAP3EVM
  USB: devio: Properly do access_ok() checks
  USB: pl2303: New vendor and product id