]> err.no Git - linux-2.6/commitdiff
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 11 Sep 2006 18:42:27 +0000 (11:42 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 11 Sep 2006 18:42:27 +0000 (11:42 -0700)
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6:
  usbtouchscreen: fix ITM data reading
  USB: New device ID for ftdi_sio usb serial driver
  USB: Support for USB20SVGA-WH & USB20SVGA-DG
  USB: hid-core.c: fix duplicate USB_DEVICE_ID_GTCO_404


Trivial merge