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
..
hardware.c	tty: move ipwireless driver from drivers/char/pcmcia/ to drivers/tty/	2011-02-22 16:23:22 -08:00
hardware.h	tty: move ipwireless driver from drivers/char/pcmcia/ to drivers/tty/	2011-02-22 16:23:22 -08:00
main.c	Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6	2011-03-16 15:11:04 -07:00
main.h	tty: move ipwireless driver from drivers/char/pcmcia/ to drivers/tty/	2011-02-22 16:23:22 -08:00
Makefile	tty: move ipwireless driver from drivers/char/pcmcia/ to drivers/tty/	2011-02-22 16:23:22 -08:00
network.c	tty: move ipwireless driver from drivers/char/pcmcia/ to drivers/tty/	2011-02-22 16:23:22 -08:00
network.h	tty: move ipwireless driver from drivers/char/pcmcia/ to drivers/tty/	2011-02-22 16:23:22 -08:00
setup_protocol.h	tty: move ipwireless driver from drivers/char/pcmcia/ to drivers/tty/	2011-02-22 16:23:22 -08:00
tty.c	tty: move ipwireless driver from drivers/char/pcmcia/ to drivers/tty/	2011-02-22 16:23:22 -08:00
tty.h	tty: move ipwireless driver from drivers/char/pcmcia/ to drivers/tty/	2011-02-22 16:23:22 -08:00