tree 5b779889655bde267e0552d0efa4d1ccdfe19a2c
parent 0016effb90589a87290a2ee721e34dc37e87b67c
parent c45d63202fbaccef7ef7946c03f27f72c809b1cc
author Linus Torvalds <torvalds@linux-foundation.org> 1241977781 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1241977781 -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-serial: ftdi_sio: fix reference counting of ftdi_private
  USB: unusual_devs: extend nokia 6288 bcd range
  USB: Gadget: fix UTF conversion in the usbstring library
  USB: Fix makefile so that CONFIG_WDM and CONFIG_TMC work.
  USB: ftdi_sio: add vendor/product id for the Marvell SheevaPlug
  USB: cxacru: Fix negative dB output