Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-22 19:01:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
e6bee325e4
linux/drivers/tty/serial
History
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
..
cpm_uart tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
jsm tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
8250_accent.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
8250_acorn.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
8250_boca.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
8250_early.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
8250_exar_st16c554.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
8250_fourport.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
8250_gsc.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
8250_hp300.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
8250_hub6.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
8250_mca.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
8250_pci.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
8250_pnp.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
8250.c serial: change the divisor latch only when prescalar actually changed 2011-02-17 11:23:50 -08:00
8250.h tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
21285.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
68328serial.c Merge 2.6.38-rc6 into tty-next 2011-02-24 11:36:31 -08:00
68328serial.h 68328serial: remove unsed m68k_serial->tqueue_hangup 2011-02-03 14:16:49 -08:00
68360serial.c Merge 2.6.38-rc6 into tty-next 2011-02-24 11:36:31 -08:00
altera_jtaguart.c tty: serial: altera_jtaguart: Fixup type usage of port flags 2011-02-22 15:50:04 -08:00
altera_uart.c tty: serial: altera_uart: Use port->regshift to store bus shift 2011-02-17 11:31:58 -08:00
amba-pl010.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
amba-pl011.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
apbuart.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
apbuart.h tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
atmel_serial.c atmel_serial: enable PPS support 2011-02-17 11:26:12 -08:00
bcm63xx_uart.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
bfin_5xx.c serial: bfin_5xx: split uart RX lock from uart port lock to avoid deadlock 2011-02-03 14:44:54 -08:00
bfin_sport_uart.c tty: serial: bfin_sport_uart: fix signedness error 2011-02-03 11:40:46 -08:00
bfin_sport_uart.h tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
clps711x.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
crisv10.c tty: now phase out the ioctl file pointer for good 2011-02-17 11:59:56 -08:00
crisv10.h tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
dz.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
dz.h tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
icom.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
icom.h tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
ifx6x60.c tiocmset: kill the file pointer argument 2011-02-17 11:52:43 -08:00
ifx6x60.h serial: ifx6x60: minor cleanup 2011-02-17 11:16:15 -08:00
imx.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
ioc3_serial.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
ioc4_serial.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
ip22zilog.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
ip22zilog.h tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
Kconfig serial: msm_serial_hs: Add MSM high speed UART driver 2011-03-07 12:08:05 -08:00
kgdboc.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
m32r_sio_reg.h tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
m32r_sio.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
m32r_sio.h tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
Makefile serial: msm_serial_hs: Add MSM high speed UART driver 2011-03-07 12:08:05 -08:00
max3100.c workqueue, freezer: unify spelling of 'freeze' + 'able' to 'freezable' 2011-02-16 17:48:59 +01:00
max3107-aava.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
max3107.c workqueue, freezer: unify spelling of 'freeze' + 'able' to 'freezable' 2011-02-16 17:48:59 +01:00
max3107.h tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
mcf.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
mfd.c serial: mfd: add a module parameter for setting each port's working mode 2011-02-22 15:49:00 -08:00
mpc52xx_uart.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
mpsc.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
mrst_max3110.c serial: mrst_max3110: make buffer larger 2011-02-03 14:13:17 -08:00
mrst_max3110.h tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
msm_serial_hs.c serial: msm_serial_hs: Add MSM high speed UART driver 2011-03-07 12:08:05 -08:00
msm_serial.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
msm_serial.h tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
msm_smd_tty.c tty: Add msm_smd_tty driver 2011-02-17 11:25:38 -08:00
mux.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
netx-serial.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
nwpserial.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
of_serial.c tty/serial: Relax the device_type restriction from of_serial 2011-02-25 10:02:16 -08:00
omap-serial.c serial: omap-serial: Enable the UART wake-up bits always 2011-02-03 14:10:22 -08:00
pch_uart.c pch_uart: reference clock on CM-iTC 2011-03-14 16:24:23 -07:00
pmac_zilog.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
pmac_zilog.h tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
pnx8xxx_uart.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
pxa.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
s3c24a0.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
s3c2400.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
s3c2410.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
s3c2412.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
s3c2440.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
s3c6400.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
s5pv210.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
sa1100.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
samsung.c Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 2011-01-20 16:39:23 -08:00
samsung.h tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
sb1250-duart.c console: rename acquire/release_console_sem() to console_lock/unlock() 2011-01-26 10:50:06 +10:00
sc26xx.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
serial_core.c tty: now phase out the ioctl file pointer for good 2011-02-17 11:59:56 -08:00
serial_cs.c fmvj18x_cs: add new id 2011-02-28 12:06:20 -08:00
serial_ks8695.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
serial_lh7a40x.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
serial_txx9.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
sh-sci.c Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 2011-01-20 16:39:23 -08:00
sh-sci.h Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 2011-01-20 16:39:23 -08:00
sn_console.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
suncore.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
suncore.h tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
sunhv.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
sunsab.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
sunsab.h tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
sunsu.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
sunzilog.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
sunzilog.h tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
timbuart.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
timbuart.h tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
uartlite.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
ucc_uart.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
vr41xx_siu.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
vt8500_serial.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
zs.c tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00
zs.h tty: move drivers/serial/ to drivers/tty/serial/ 2011-01-13 12:10:18 -08:00