aboutsummaryrefslogtreecommitdiff
path: root/drivers/char/mxser.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-09-11 11:42:27 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-11 11:42:27 -0700
commit5eea7ee2075b245d505285bb422e2fa8d686e5c8 (patch)
tree2a2c6e67cfbf8fb6f40b6b5c41c63617f2f0ae6a /drivers/char/mxser.c
parente004876c3b0b6a71406069b0e55368cb9bbdc920 (diff)
parent09494d5d11628f118496747b74db3e56d071c6bc (diff)
Merge master.kernel.org:/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
Diffstat (limited to 'drivers/char/mxser.c')
0 files changed, 0 insertions, 0 deletions