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)
commit5eea7ee2075b245d505285bb422e2fa8d686e5c8
tree2a2c6e67cfbf8fb6f40b6b5c41c63617f2f0ae6a
parente004876c3b0b6a71406069b0e55368cb9bbdc920
parent09494d5d11628f118496747b74db3e56d071c6bc
Merge /pub/scm/linux/kernel/git/gregkh/usb-2.6

* 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