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: fix usb-serial/ftdi build warning
  USB: fix usb-serial/generic build warning
  USB: another entry for the quirk list
  USB: remove duplicated device id in airprime driver
  USB: omap_udc: workaround dma_free_coherent() bogosity
  UHCI: Fix problem caused by lack of terminating QH

...

This commit is contained in:

Linus Torvalds 2007-03-26 14:34:11 -07:00

parent 55ab97569f 3b009c637f

commit 8b66a454bf

8 changed files with 145 additions and 98 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

3

drivers/usb/core/quirks.c

View file

103

drivers/usb/gadget/omap_udc.c

View file

26

drivers/usb/host/uhci-debug.c

View file

3

drivers/usb/host/uhci-hcd.c

View file

94

drivers/usb/host/uhci-q.c

View file

1

drivers/usb/serial/airprime.c

View file

6

drivers/usb/serial/ftdi_sio.c

View file

7

drivers/usb/serial/generic.c

View file