original_kernel/drivers/usb/serial
Linus Torvalds e6bee325e4 Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
* 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (76 commits)
  pch_uart: reference clock on CM-iTC
  pch_phub: add new device ML7213
  n_gsm: fix UIH control byte : P bit should be 0
  n_gsm: add a documentation
  serial: msm_serial_hs: Add MSM high speed UART driver
  tty_audit: fix tty_audit_add_data live lock on audit disabled
  tty: move cd1865.h to drivers/staging/tty/
  Staging: tty: fix build with epca.c driver
  pcmcia: synclink_cs: fix prototype for mgslpc_ioctl()
  Staging: generic_serial: fix double locking bug
  nozomi: don't use flush_scheduled_work()
  tty/serial: Relax the device_type restriction from of_serial
  MAINTAINERS: Update HVC file patterns
  tty: phase out of ioctl file pointer for tty3270 as well
  tty: forgot to remove ipwireless from drivers/char/pcmcia/Makefile
  pch_uart: Fix DMA channel miss-setting issue.
  pch_uart: fix exclusive access issue
  pch_uart: fix auto flow control miss-setting issue
  pch_uart: fix uart clock setting issue
  pch_uart : Use dev_xxx not pr_xxx
  ...

Fix up trivial conflicts in drivers/misc/pch_phub.c (same patch applied
twice, then changes to the same area in one branch)
2011-03-16 15:11:04 -07:00
..
ChangeLog.history
Kconfig
Makefile
Makefile-keyspan_pda_fw
aircable.c
ark3116.c
belkin_sa.c
belkin_sa.h
bus.c
ch341.c
console.c
cp210x.c
cyberjack.c
cypress_m8.c
cypress_m8.h
digi_acceleport.c
empeg.c
ezusb.c
ezusb_convert.pl
ftdi_sio.c
ftdi_sio.h
ftdi_sio_ids.h
funsoft.c
garmin_gps.c
generic.c
hp4x.c
io_16654.h
io_edgeport.c
io_edgeport.h
io_ionsp.h
io_tables.h
io_ti.c
io_ti.h
io_usbvend.h
ipaq.c
ipw.c
ir-usb.c
iuu_phoenix.c
iuu_phoenix.h
keyspan.c
keyspan.h
keyspan_pda.c
keyspan_usa26msg.h
keyspan_usa28msg.h
keyspan_usa49msg.h
keyspan_usa67msg.h
keyspan_usa90msg.h
kl5kusb105.c
kl5kusb105.h
kobil_sct.c
kobil_sct.h
mct_u232.c
mct_u232.h
mos7720.c
mos7840.c
moto_modem.c
navman.c
omninet.c
opticon.c
option.c
oti6858.c
oti6858.h
pl2303.c
pl2303.h
qcaux.c
qcserial.c
safe_serial.c
sam-ba.c
siemens_mpi.c
sierra.c
spcp8x5.c
ssu100.c
symbolserial.c
ti_usb_3410_5052.c
ti_usb_3410_5052.h
usb-serial.c
usb-wwan.h
usb_debug.c
usb_wwan.c
visor.c
visor.h
vivopay-serial.c
whiteheat.c
whiteheat.h
zio.c