Daniel Sangorrin 9a49a14da4 USB: serial: ftdi: correct merge conflict with CONTEC id ...

This patch corrects a problem with the merge of a previous
patch to add the CONTEC identifier.

I believe the merge problem occurred with the commit:
dee5658b48

Originally I submitted a patch and then they asked me to order the IDs
and resubmit, so did I. But unfortunately in the end somehow both
patches were merged.

Signed-off-by: Daniel Sangorrin <daniel.sangorrin@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

2010-06-30 08:16:06 -07:00

..

aircable.c

USB: aircable: fix incorrect write-buffer length

2010-05-20 13:21:49 -07:00

ark3116.c

USB: ark3116: reimplement read processing

2010-05-20 13:21:43 -07:00

belkin_sa.c

USB: belkin_sa: implement line status handling

2010-05-20 13:21:48 -07:00

belkin_sa.h

USB: belkin_sa.h: checkpatch cleanups

2010-05-20 13:21:46 -07:00

bus.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

ch341.c

USB: serial: refactor generic close

2010-05-20 13:21:33 -07:00

ChangeLog.history

trivial: Fix misspelling of firmware

2009-03-30 15:21:59 +02:00

console.c

usb-console: pass baud from console to the initial tty open

2010-05-20 13:21:32 -07:00

cp210x.c

USB: CP210x New Device IDs 11 New device IDs

2010-05-20 13:21:48 -07:00

cyberjack.c

USB: tty: Prune uses of tty_request_room in the USB layer

2010-03-02 14:55:12 -08:00

cypress_m8.c

USB: cypress_m8: use kfifo to implement write buffering

2010-05-20 13:21:49 -07:00

cypress_m8.h

USB: cypress_m8.h: checkpatch cleanups

2010-05-20 13:21:46 -07:00

digi_acceleport.c

USB: serial: digi_acceleport: Eliminate a NULL pointer dereference

2010-06-04 13:16:19 -07:00

empeg.c

USB: empeg: reimplement using generic framework

2010-05-20 13:21:48 -07:00

ezusb_convert.pl

…

ezusb.c

USB: remove use of err() in drivers/usb/serial

2008-10-17 14:41:10 -07:00

ftdi_sio_ids.h

USB: serial: ftdi: correct merge conflict with CONTEC id

2010-06-30 08:16:06 -07:00

ftdi_sio.c

USB: serial: ftdi: correct merge conflict with CONTEC id

2010-06-30 08:16:06 -07:00

ftdi_sio.h

USB: ftdi_sio: checkpatch cleanups

2010-05-20 13:21:46 -07:00

funsoft.c

USB serial: make USB device id constant

2010-03-02 14:54:16 -08:00

garmin_gps.c

USB: tty: Prune uses of tty_request_room in the USB layer

2010-03-02 14:55:12 -08:00

generic.c

USB: serial: add special case for processing of empty read urbs

2010-05-20 13:21:48 -07:00

hp4x.c

USB serial: make USB device id constant

2010-03-02 14:54:16 -08:00

io_16654.h

…

io_edgeport.c

USB: io_edgeport: Use kzalloc

2010-05-20 13:21:46 -07:00

io_edgeport.h

USB: io_edgeport: checkpatch cleanups

2010-05-20 13:21:47 -07:00

io_ionsp.h

USB: io_edgeport: checkpatch cleanups

2010-05-20 13:21:47 -07:00

io_tables.h

USB serial: make USB device id constant

2010-03-02 14:54:16 -08:00

io_ti.c

USB: io_ti: use kfifo to implement write buffering

2010-05-20 13:21:50 -07:00

io_ti.h

USB: io_edgeport: checkpatch cleanups

2010-05-20 13:21:47 -07:00

io_usbvend.h

USB: io_edgeport: checkpatch cleanups

2010-05-20 13:21:47 -07:00

ipaq.c

USB: ipaq: reimplement using generic framework

2010-05-20 13:21:48 -07:00

ipw.c

USB: ipw: reimplement using generic framework

2010-05-20 13:21:46 -07:00

ir-usb.c

USB: ir-usb: fix incorrect write-buffer length

2010-05-20 13:21:50 -07:00

iuu_phoenix.c

USB: serial: allow drivers to define bulk buffer sizes

2010-05-20 13:21:33 -07:00

iuu_phoenix.h

USB: add iuu_phoenix driver

2008-02-01 14:34:47 -08:00

Kconfig

USB: usbserial: fix mos7720 dependencies

2010-05-20 13:21:39 -07:00

keyspan_pda.c

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

2010-03-03 08:48:58 -08:00

keyspan_usa26msg.h

…

keyspan_usa28msg.h

…

keyspan_usa49msg.h

…

keyspan_usa67msg.h

USB Serial Keyspan: add support for USA-49WG & USA-28XG

2007-07-12 16:29:45 -07:00

keyspan_usa90msg.h

…

keyspan.c

USB: remove references to port->port.count from the serial drivers

2010-03-02 14:55:12 -08:00

keyspan.h

USB serial: make USB device id constant

2010-03-02 14:54:16 -08:00

kl5kusb105.c

USB: kl5usb105: reimplement using generic framework

2010-05-20 13:21:50 -07:00

kl5kusb105.h

USB: kl5kusb105.h: checkpatch cleanups

2010-05-20 13:21:47 -07:00

kobil_sct.c

USB: kobil: fix memory leak

2010-05-20 13:21:47 -07:00

kobil_sct.h

USB: kobil_sct.h: checkpatch cleanups

2010-05-20 13:21:47 -07:00

Makefile

usb serial: Add generic USB wwan support

2010-05-20 13:21:37 -07:00

Makefile-keyspan_pda_fw

…

mct_u232.c

USB: serial: refactor generic close

2010-05-20 13:21:33 -07:00

mct_u232.h

USB: mct_u232.h: checkpatch cleanups

2010-05-20 13:21:46 -07:00

mos7720.c

USB: usbserial: mos7720: cleanup, consolidation, replace send_mos_cmd with {read,write}_mos_reg

2010-05-20 13:21:39 -07:00

mos7840.c

USB: mos7840: fix null-pointer dereference

2010-06-04 13:16:18 -07:00

moto_modem.c

USB serial: make USB device id constant

2010-03-02 14:54:16 -08:00

navman.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

omninet.c

USB: Convert concatenated __FILE__ to %s, __FILE__

2010-03-02 14:54:59 -08:00

opticon.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

option.c

USB: option.c: OLIVETTI OLICARD100 support

2010-05-20 13:21:47 -07:00

oti6858.c

USB: oti6858: use port write fifo

2010-05-20 13:21:49 -07:00

oti6858.h

USB: oti6858 usb-serial driver (in Nokia CA-42 cable)

2007-07-12 16:29:47 -07:00

pl2303.c

USB: pl2303: use tty_insert_flip_string_fixed_flag

2010-05-20 13:21:44 -07:00

pl2303.h

USB: pl2303.h: checkpatch cleanups

2010-05-20 13:21:47 -07:00

qcaux.c

USB: qcaux: add Samsung U520 device ID

2010-05-20 13:21:40 -07:00

qcserial.c

USB: qcserial: Add support for Qualcomm Gobi 2000 devices

2010-05-20 13:21:37 -07:00

safe_serial.c

USB: safe_serial: straighten out read processing

2010-05-20 13:21:49 -07:00

siemens_mpi.c

USB serial: make USB device id constant

2010-03-02 14:54:16 -08:00

sierra.c

USB: Add id for HP ev2210 a.k.a Sierra MC5725 miniPCI-e Cell Modem.

2010-04-22 15:18:24 -07:00

spcp8x5.c

USB: spcp8x5: reimplement using generic framework

2010-05-20 13:21:48 -07:00

symbolserial.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

ti_usb_3410_5052.c

USB: ti_usb: use kfifo to implement write buffering

2010-05-20 13:21:50 -07:00

ti_usb_3410_5052.h

USB: ti_usb_3410_5052: adding multitech dialup fax/modem devices

2010-04-22 15:18:20 -07:00

usb_debug.c

USB: usb_debug: set bulk out size at probe

2010-05-20 13:21:49 -07:00

usb_wwan.c

usb serial: Add generic USB wwan support

2010-05-20 13:21:37 -07:00

usb-serial.c

USB: serial: reimplement generic fifo-based writes

2010-05-20 13:21:42 -07:00

usb-wwan.h

usb serial: Add generic USB wwan support

2010-05-20 13:21:37 -07:00

visor.c

USB: visor: increase bulk-out buffer size

2010-05-20 13:21:48 -07:00

visor.h

USB: visor.h: checkpatch cleanups

2010-05-20 13:21:47 -07:00

vivopay-serial.c

USB: serial: Add support for ViVOtech ViVOpay devices.

2010-03-02 14:54:57 -08:00

whiteheat.c

USB: tty: sort out the request_room handling for whiteheat

2010-03-02 14:55:09 -08:00

whiteheat.h

whiteheat: coding style

2008-07-22 13:03:22 -07:00

zio.c

USB Serial Driver: ZIO Motherboard

2010-05-20 13:21:32 -07:00