Daniel Sangorrin ada56d5033 USB: serial: ftdi: add CONTEC vendor and product id ...

commit dee5658b48 upstream.

This is a patch to ftdi_sio_ids.h and ftdi_sio.c that adds identifiers for
CONTEC USB serial converter.  I tested it with the device COM-1(USB)H

[akpm@linux-foundation.org: keep the VIDs sorted a bit]
Signed-off-by: Daniel Sangorrin <daniel.sangorrin@gmail.com>
Cc: Andreas Mohr <andi@lisas.de>
Cc: Radek Liboska <liboska@uochb.cas.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

2010-04-01 15:58:34 -07:00

..

accessibility

…

acpi

ACPI: Be in TS_POLLING state during mwait based C-state entry

2010-03-15 08:49:36 -07:00

amba

Merge branches 'arm', 'at91', 'bcmring', 'ep93xx', 'mach-types', 'misc' and 'w90x900' into devel

2009-09-12 12:01:34 +01:00

ata

pata_hpt3x2n: always stretch UltraDMA timing

2010-03-15 08:49:58 -07:00

atm

net: Make setsockopt() optlen be unsigned.

2009-09-30 16:12:20 -07:00

auxdisplay

…

base

Driver-Core: devtmpfs - reset inode permissions before unlinking

2010-03-15 08:49:53 -07:00

block

cciss: Make cciss_seq_show handle holes in the h->drv[] array

2010-02-23 07:37:49 -08:00

bluetooth

Bluetooth: Prevent ill-timed autosuspend in USB driver

2010-01-06 15:03:43 -08:00

cdrom

sysctl: remove "struct file *" argument of ->proc_handler

2009-09-24 07:21:04 -07:00

char

tty: Keep the default buffering to sub-page units

2010-04-01 15:58:30 -07:00

clocksource

clocksource: Fix up a registration/IRQ race in the sh drivers.

2010-03-15 08:49:44 -07:00

connector

connector: Delete buggy notification code.

2010-02-09 04:50:59 -08:00

cpufreq

[CPUFREQ] Fix stale cpufreq_cpu_governor pointer

2009-11-17 23:15:04 -05:00

cpuidle

drivers/cpuidle/governors/menu.c: fix undefined reference to `__udivdi3'

2010-01-18 10:19:31 -08:00

crypto

crypto: padlock-sha - Add import/export support

2010-02-23 07:37:54 -08:00

dca

dca: module load should not be an error message

2009-09-13 10:27:04 -07:00

dio

…

dma

ioat: fix infinite timeout checking in ioat2_quiesce

2010-02-23 07:37:49 -08:00

edac

amd64_edac: Do not falsely trigger kerneloops

2010-02-23 07:37:52 -08:00

eisa

…

firewire

firewire: core: add_descriptor size check

2010-02-09 04:50:52 -08:00

firmware

DMI: allow omitting ident strings in DMI tables

2010-01-28 15:01:52 -08:00

gpio

gpiolib: Actually set output state in wm831x_gpio_direction_output()

2010-03-15 08:49:57 -07:00

gpu

drm/edid: Unify detailed block parsing between base and extension blocks

2010-04-01 15:58:12 -07:00

hid

HID: usbhid: introduce timeout for stuck ctrl/out URBs

2010-03-15 08:49:37 -07:00

hwmon

hwmon: (tmp421) Restore missing inputs

2010-03-15 08:49:57 -07:00

i2c

i2c-i801: Don't use the block buffer for I2C block writes

2010-04-01 15:58:07 -07:00

ide

slc90e66: fix UDMA handling

2009-12-18 14:05:04 -08:00

idle

ioat: switch watchdog and reset handler from workqueue to timer

2009-09-08 17:30:24 -07:00

ieee1394

headers: remove sched.h from interrupt.h

2009-10-11 11:20:58 -07:00

ieee802154

ieee802154: dont leak skbs in ieee802154_fake_xmit()

2009-11-19 13:16:21 -08:00

infiniband

Fix failure exit in ipathfs

2010-02-09 04:50:48 -08:00

input

Input: wacom - ensure the device is initialized properly upon resume

2010-04-01 15:58:17 -07:00

isdn

gigaset: prune use of tty_buffer_request_room

2010-04-01 15:58:24 -07:00

leds

leds-gpio: fix possible crash on OF device unbinding

2009-11-16 11:50:42 +00:00

lguest

lguest: fix bug in setting guest GDT entry

2010-01-06 15:05:19 -08:00

macintosh

macintosh/therm_adt746x: Fix sysfs attributes lifetime

2010-03-15 08:49:46 -07:00

mca

…

md

dm: free dm_io before bio_endio not after

2010-03-15 08:50:14 -07:00

media

V4L/DVB (13961): em28xx-dvb: fix memleak in dvb_fini()

2010-04-01 15:58:13 -07:00

memstick

memstick: move dev_dbg

2009-09-24 07:21:05 -07:00

message

SCSI: mptfusion : mptscsih_abort return value should be SUCCESS instead of value 0.

2010-02-23 07:37:55 -08:00

mfd

mfd: WM835x GPIO direction register is not locked

2010-01-22 15:18:18 -08:00

misc

SCSI: enclosure: fix oops while iterating enclosure_status array

2010-01-25 10:49:37 -08:00

mmc

s3cmci: s3cmci_card_present: Use no_detect to decide whether there is a card detect pin

2010-03-15 08:50:14 -07:00

mtd

UBI: fix volume creation input checking

2010-02-09 04:50:45 -08:00

net

ath9k: fix lockdep warning when unloading module

2010-04-01 15:58:18 -07:00

nubus

…

of

of: Remove nested function

2009-10-15 09:58:27 -06:00

oprofile

oprofile: warn on freeing event buffer too early

2009-10-09 21:32:05 +02:00

parisc

mm: replace various uses of num_physpages by totalram_pages

2009-09-22 07:17:38 -07:00

parport

sysctl: remove "struct file *" argument of ->proc_handler

2009-09-24 07:21:04 -07:00

pci

pci: add support for 82576NS serdes to existing SR-IOV quirk

2010-04-01 15:58:15 -07:00

pcmcia

PCI/cardbus: Add a fixup hook and fix powerpc

2010-01-22 15:18:26 -08:00

platform

thinkpad-acpi: fix bluetooth/wwan resume

2010-03-15 08:50:04 -07:00

pnp

ACPI: remove acpi_device.flags.hardware_id

2009-09-25 15:09:48 -04:00

power

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2009-09-23 03:49:27 +04:00

pps

pps: events reporting fix up

2009-11-12 07:26:01 -08:00

ps3

powerpc/ps3: Workaround for flash memory I/O error

2009-09-11 11:28:00 +10:00

rapidio

…

regulator

regulator: Fix display of null constraints for regulators

2010-02-23 07:37:49 -08:00

rtc

rtc-coh901331: fix braces in resume code

2010-03-15 08:50:14 -07:00

s390

dasd: remove strings from s390dbf

2010-02-23 07:37:54 -08:00

sbus

const: make block_device_operations const

2009-09-22 07:17:25 -07:00

scsi

SCSI: scsi_transport_fc: Fix synchronization issue while deleting vport

2010-04-01 15:58:28 -07:00

serial

serial: imx: fix NULL dereference Oops when pdata == NULL

2010-03-15 08:49:54 -07:00

sfi

SFI: remove __init from sfi_verify_table

2009-10-03 01:16:12 -04:00

sh

sh: Fix up simplified multi-evt handling under sparseirq.

2009-08-31 15:15:33 +09:00

sn

…

spi

SPI: spi_txx9: Fix bit rate calculation

2009-12-02 23:58:32 +00:00

ssb

ssb: Fix range check in sprom write

2009-12-18 14:03:24 -08:00

staging

Staging: mimio: remove the mimio driver

2010-03-15 08:49:46 -07:00

tc

…

telephony

headers: smp_lock.h redux

2009-07-12 12:22:34 -07:00

thermal

acpi: thermal: Add EOL to the trip_point_N_type strings

2009-11-05 17:33:24 -05:00

uio

uio: pm_runtime_disable is needed if failed

2009-11-13 11:36:00 +09:00

usb

USB: serial: ftdi: add CONTEC vendor and product id

2010-04-01 15:58:34 -07:00

uwb

headers: remove sched.h from interrupt.h

2009-10-11 11:20:58 -07:00

video

efifb: fix framebuffer handoff

2010-04-01 15:58:13 -07:00

virtio

virtio: fix out of range array access

2010-04-01 15:58:18 -07:00

vlynq

drivers/vlynq/vlynq.c: fix resource size off by 1 error

2009-09-24 07:21:05 -07:00

w1

ds2482: Discard obsolete detect method

2009-10-04 22:53:41 +02:00

watchdog

bfin: fix max timeout calculation

2010-03-15 08:49:32 -07:00

xen

xen: fix hang on suspend.

2010-01-18 10:19:44 -08:00

zorro

…

Kconfig

…

Makefile

Merge git://git.infradead.org/mtd-2.6

2009-09-23 10:07:49 -07:00