Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-06 03:51:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
5f05647dd8
linux/drivers/usb/serial
History
Linus Torvalds 5cc1035062 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (141 commits)
  USB: mct_u232: fix broken close
  USB: gadget: amd5536udc.c: fix error path
  USB: imx21-hcd - fix off by one resource size calculation
  usb: gadget: fix Kconfig warning
  usb: r8a66597-udc: Add processing when USB was removed.
  mxc_udc: add workaround for ENGcm09152 for i.MX35
  USB: ftdi_sio: add device ids for ScienceScope
  USB: musb: AM35x: Workaround for fifo read issue
  USB: musb: add musb support for AM35x
  USB: AM35x: Add musb support
  usb: Fix linker errors with CONFIG_PM=n
  USB: ohci-sh - use resource_size instead of defining its own resource_len macro
  USB: isp1362-hcd - use resource_size instead of defining its own resource_len macro
  USB: isp116x-hcd - use resource_size instead of defining its own resource_len macro
  USB: xhci: Fix compile error when CONFIG_PM=n
  USB: accept some invalid ep0-maxpacket values
  USB: xHCI: PCI power management implementation
  USB: xHCI: bus power management implementation
  USB: xHCI: port remote wakeup implementation
  USB: xHCI: port power management implementation
  ...

Manually fix up (non-data) conflict: the SCSI merge gad renamed the
'hw_sector_size' member to 'physical_block_size', and the USB tree
brought a new use of it.
2010-10-22 20:30:48 -07:00
..
aircable.c USB: aircable: fix incorrect write-buffer length 2010-05-20 13:21:49 -07:00
ark3116.c tty: Convert the USB drivers to the new icount interface 2010-10-22 10:20:04 -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
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: Add WAGO 750-923 Service Cable device ID 2010-10-22 10:22:06 -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 tty: Fix the digi acceleport driver NULL checks 2010-08-10 13:47:41 -07:00
empeg.c USB: empeg: reimplement using generic framework 2010-05-20 13:21:48 -07:00
ezusb_convert.pl
ezusb.c
ftdi_sio_ids.h USB: ftdi_sio: add device ids for ScienceScope 2010-10-22 10:22:17 -07:00
ftdi_sio.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 2010-10-22 20:30:48 -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 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 2010-08-28 13:55:31 -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 tty: Convert the USB drivers to the new icount interface 2010-10-22 10:20:04 -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 tty: Convert the USB drivers to the new icount interface 2010-10-22 10:20:04 -07:00
io_ti.c tty: Convert the USB drivers to the new icount interface 2010-10-22 10:20:04 -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 Revert "USB: Adding support for HTC Smartphones to ipaq" 2010-08-10 14:35:35 -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: iuu_phoenix: Add support for different baud rates. 2010-08-10 14:35:34 -07:00
iuu_phoenix.h
Kconfig USB: sam-ba: add driver for Atmel SAM Boot Assistant (SAM-BA) 2010-10-22 10:21:20 -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
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 fix typos concerning "initiali[zs]e" 2010-06-16 18:05:05 +02: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: makefile cleanup 2010-10-22 10:22:07 -07:00
Makefile-keyspan_pda_fw
mct_u232.c USB: mct_u232: fix broken close 2010-10-22 10:22:19 -07:00
mct_u232.h USB: mct_u232.h: checkpatch cleanups 2010-05-20 13:21:46 -07:00
mos7720.c tty: Convert the USB drivers to the new icount interface 2010-10-22 10:20:04 -07:00
mos7840.c tty: Convert the USB drivers to the new icount interface 2010-10-22 10:20:04 -07:00
moto_modem.c USB serial: make USB device id constant 2010-03-02 14:54:16 -08:00
navman.c USB: add device IDs for igotu to navman 2010-08-23 20:50:15 -07:00
omninet.c USB: Convert concatenated __FILE__ to %s, __FILE__ 2010-03-02 14:54:59 -08:00
opticon.c USB: opticon: Whitespace fixes in opticon driver 2010-10-22 10:22:10 -07:00
option.c USB: option: Add new ONDA vendor id and product id for ONDA MT825UP 2010-10-22 10:21:44 -07:00
oti6858.c USB: oti6858: use port write fifo 2010-05-20 13:21:49 -07:00
oti6858.h
pl2303.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 2010-08-28 13:55:31 -07:00
pl2303.h USB: pl2303: New vendor and product id 2010-08-23 20:50:15 -07:00
qcaux.c USB: qcaux: add Samsung U520 device ID 2010-05-20 13:21:40 -07:00
qcserial.c USB: qcserial: Enable Diagnostics Monitor and GPS ports on Gobi 2000 2010-10-22 10:21:49 -07:00
safe_serial.c USB: safe_serial: straighten out read processing 2010-05-20 13:21:49 -07:00
sam-ba.c USB: sam-ba: add driver for Atmel SAM Boot Assistant (SAM-BA) 2010-10-22 10:21:20 -07:00
siemens_mpi.c USB serial: make USB device id constant 2010-03-02 14:54:16 -08:00
sierra.c USB: Add PID for Sierra 250U to drivers/usb/serial/sierra.c 2010-07-26 12:00:57 -07:00
spcp8x5.c USB: spcp8x5: reimplement using generic framework 2010-05-20 13:21:48 -07:00
ssu100.c tty: Fix warning left over from TIOCGICOUNT changes 2010-10-22 10:20:05 -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 tty: Convert the USB drivers to the new icount interface 2010-10-22 10:20:04 -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 tty: Make tiocgicount a handler 2010-10-22 10:20:04 -07:00
usb-wwan.h usb serial: Add generic USB wwan support 2010-05-20 13:21:37 -07:00
visor.c USB: visor: fix initialisation of UX50/TH55 devices 2010-10-22 10:22:08 -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
zio.c USB Serial Driver: ZIO Motherboard 2010-05-20 13:21:32 -07:00