kevin/linux
1
Fork 0
Code
4c1ac1b491
linux/drivers/usb/serial
History
David Howells 4c1ac1b491 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 
Conflicts:

	drivers/infiniband/core/iwcm.c
	drivers/net/chelsio/cxgb2.c
	drivers/net/wireless/bcm43xx/bcm43xx_main.c
	drivers/net/wireless/prism54/islpci_eth.c
	drivers/usb/core/hub.h
	drivers/usb/input/hid-core.c
	net/core/netpoll.c

Fix up merge failures with Linus's head and fix new compilation failures.

Signed-Off-By: David Howells <dhowells@redhat.com>
2006-12-05 14:37:56 +00:00
..
aircable.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2006-12-05 14:37:56 +00:00
airprime.c USB: airprime: New device ID 2006-12-01 14:23:30 -08:00
ark3116.c USB serial: replace kmalloc+memset with kzalloc 2006-12-01 14:25:51 -08:00
belkin_sa.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
belkin_sa.h
bus.c [PATCH] USB: move usb-serial.h to include/linux/usb/ 2006-07-12 16:03:25 -07:00
ChangeLog.history
console.c USB serial: replace kmalloc+memset with kzalloc 2006-12-01 14:25:51 -08:00
cp2101.c USB: new VID/PID-combos for cp2101 2006-11-03 11:57:18 -08:00
cyberjack.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
cypress_m8.c usb: cypress_m8 init error path fix 2006-12-01 14:23:37 -08:00
cypress_m8.h [PATCH] USB: cypress_m8: add support for the Nokia ca42-version 2 cable 2006-03-20 14:50:00 -08:00
digi_acceleport.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2006-12-05 14:37:56 +00:00
empeg.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
ezusb_convert.pl
ezusb.c USB: kmemdup() cleanup in drivers/usb/ 2006-12-01 14:23:27 -08:00
ftdi_sio.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2006-12-05 14:37:56 +00:00
ftdi_sio.h USB: ftdi driver pid for dmx-interfaces 2006-11-16 14:26:11 -08:00
funsoft.c [PATCH] USB: move usb-serial.h to include/linux/usb/ 2006-07-12 16:03:25 -07:00
garmin_gps.c USB serial: replace kmalloc+memset with kzalloc 2006-12-01 14:25:51 -08:00
generic.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
hp4x.c [PATCH] USB: move usb-serial.h to include/linux/usb/ 2006-07-12 16:03:25 -07:00
io_16654.h
io_edgeport.c usb: io_edgeport kill urb cleanup 2006-12-01 14:23:34 -08:00
io_edgeport.h
io_fw_boot2.h
io_fw_boot.h
io_fw_down2.h
io_fw_down3.h
io_fw_down.h
io_ionsp.h
io_tables.h
io_ti.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
io_ti.h
io_usbvend.h
ipaq.c USB: ipaq: Add HTC Modem Support 2006-11-16 14:26:12 -08:00
ipaq.h
ipw.c USB: kmemdup() cleanup in drivers/usb/ 2006-12-01 14:23:27 -08:00
ir-usb.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
Kconfig USB: add driver for the USB debug devices 2006-12-01 14:25:52 -08:00
keyspan_mpr_fw.h
keyspan_pda_fw.h
keyspan_pda.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
keyspan_pda.S
keyspan_usa18x_fw.h
keyspan_usa19_fw.h
keyspan_usa19qi_fw.h
keyspan_usa19qw_fw.h
keyspan_usa19w_fw.h
keyspan_usa26msg.h
keyspan_usa28_fw.h
keyspan_usa28msg.h
keyspan_usa28x_fw.h
keyspan_usa28xa_fw.h
keyspan_usa28xb_fw.h
keyspan_usa49msg.h
keyspan_usa49w_fw.h
keyspan_usa49wlc_fw.h
keyspan_usa90msg.h
keyspan.c usb: keyspan free urb cleanup 2006-12-01 14:23:34 -08:00
keyspan.h
kl5kusb105.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
kl5kusb105.h
kobil_sct.c usb: kobil_sct kill urb cleanup 2006-12-01 14:23:34 -08:00
kobil_sct.h
Makefile USB: add driver for the USB debug devices 2006-12-01 14:25:52 -08:00
Makefile-keyspan_pda_fw
mct_u232.c usb: mct_u232 free urb cleanup 2006-12-01 14:23:34 -08:00
mct_u232.h
mos7720.c USB: add USB serial mos7720 driver 2006-10-17 14:46:32 -07:00
mos7840.c USB serial: replace kmalloc+memset with kzalloc 2006-12-01 14:25:51 -08:00
navman.c usb: navman kill urb cleanup 2006-12-01 14:23:35 -08:00
omninet.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
option.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
pl2303.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
pl2303.h USB: Add vendor / product ID to pl2303 2006-09-28 15:36:42 -07:00
safe_serial.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
sierra.c USB: sierra: Fix id for Sierra Wireless MC8755 in new table 2006-11-03 11:57:18 -08:00
ti_fw_3410.h
ti_fw_5052.h
ti_usb_3410_5052.c USB serial: replace kmalloc+memset with kzalloc 2006-12-01 14:25:51 -08:00
ti_usb_3410_5052.h usb-serial: ti_usb, TI ez430 development tool ID 2006-12-01 14:23:30 -08:00
usb_debug.c USB: add driver for the USB debug devices 2006-12-01 14:25:52 -08:00
usb-serial.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2006-12-05 14:37:56 +00:00
visor.c usb: visor kill urb cleanup 2006-12-01 14:23:35 -08:00
visor.h [PATCH] USB: visor.c id for gspda smartphone 2006-02-28 12:42:07 -08:00
whiteheat_fw.h
whiteheat.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
whiteheat.h
xircom_pgs_fw.h
xircom_pgs.S