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

Browse source

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6:
  USB: drivers/usb/serial/bus.c: Fix incompatible pointer type warning
  USB: another quirky device (LCD display)
  USB: fix serial gadget ACM breakage
  USB: More USB_QUIRK_RESET_RESUME devices
  USB Mass Storage: limit "Rockchip ROCK MP3" device (071b:3203) max I/O to 64 sectors per command
  USB: Nikon D40 Quirks
  USB: Add Sony Ericsson P1i to unusual_devs.h
  USB: option: Add Dell HSDPA 5520 to driver
  USB: option: Add a new device ID for the HUAWEI E220 HSDPA modem.
  USB: fix linked list insertion bugfix for usb core
  USB: quirky flash drive
  USB: prevent Genesys USB-IDE from autosuspending
  USB: prevent Thomson card reader from autosuspending
  USB: Add iPhone device id to the quirk list.
  USB: ftdi_sio: add of a new product/manufacturer, TML
  usb/misc/sisusbvga: add product ID of TARGUS/MCT device
  USB: oti6858: Remove broken ioctl code in -mm tree and also the broken fixes

...

This commit is contained in:

Linus Torvalds 2007-09-11 10:13:01 -07:00

parent af5b14c49a 03fc370bdc

commit ae292dbd2e

10 changed files with 85 additions and 27 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

drivers/usb/core/driver.c

View file

25

drivers/usb/core/quirks.c

View file

25

drivers/usb/gadget/serial.c

View file

1

drivers/usb/misc/sisusbvga/sisusb.c

View file

2

drivers/usb/serial/bus.c

View file

1

drivers/usb/serial/ftdi_sio.c

View file

8

drivers/usb/serial/ftdi_sio.h

View file

3

drivers/usb/serial/option.c

View file

15

drivers/usb/serial/oti6858.c

View file

30

drivers/usb/storage/unusual_devs.h

View file