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

Browse source

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
  USB: Storage: Update unusual_devs entry for Datafab KECF-USB
  USB: Correct Makefile to make isp1760 buildable
  USB: option: New mobile broadband modems to be supported
  USB: two more usb ids for ti_usb_3410_5052
  USB: ftdi_sio: unlock_kernel() on error in set_serial_info()
  USB: usb-storage: add Pentax to the bad-vendor list
  USB: ftdi_sio: add support for the NDI Polaris system
  USB: usb-serial: fix the aircable_init failure path
  USB: usb-storage: remove WARN from last-sector hacks
  Revert USB: option: add Pantech cards
  USB: cdc-acm.c: remove duplicate lines for MTK gps support
  USB: fsl_qe_udc: Fix stalled TX requests bug
  USB: fsl_qe_udc: Fix muram corruption by disabled endpoints
  USB: fsl_qe_udc: Fix disconnects reporting during bus reset
  USB: fsl_qe_udc: Fix QE USB controller initialization
  USB: fsl_qe_udc: Fix recursive locking bug in ch9getstatus()
  USB: fsl_qe_udc: Fix oops on QE UDC probe failure

...

This commit is contained in:

Linus Torvalds 2009-02-09 13:59:51 -08:00

parent 7d1676629e 049a6acb50

commit d006b2b620

12 changed files with 117 additions and 105 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

1

drivers/usb/Makefile

View file

3

drivers/usb/class/cdc-acm.c

View file

46

drivers/usb/gadget/fsl_qe_udc.c

View file

4

drivers/usb/serial/aircable.c

View file

5

drivers/usb/serial/ftdi_sio.c

View file

3

drivers/usb/serial/ftdi_sio.h

View file

93

drivers/usb/serial/option.c

View file

10

drivers/usb/serial/ti_usb_3410_5052.c

View file

2

drivers/usb/serial/ti_usb_3410_5052.h

View file

2

drivers/usb/storage/scsiglue.c

View file

36

drivers/usb/storage/transport.c

View file

17

drivers/usb/storage/unusual_devs.h

View file