Greg Kroah-Hartman c87985a3ce Merge tty-next into 3.6-rc1 ... This handles the merge issue in: arch/um/drivers/line.c arch/um/drivers/line.h And resolves the duplicate patches that were in both trees do to the tty-next branch not getting merged into 3.6-rc1. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2012-08-06 09:48:31 -07:00
..
hvc	Merge tty-next into 3.6-rc1	2012-08-06 09:48:31 -07:00
ipwireless	TTY: ipwireless, use tty from tty_port	2012-04-09 11:30:39 -07:00
serial	Merge tty-next into 3.6-rc1	2012-08-06 09:48:31 -07:00
vt	vt: fix race in vt_waitactive()	2012-07-26 13:37:02 -07:00
Kconfig	tty/powerpc: early udbg consoles can't be modules	2012-02-24 16:11:50 -08:00
Makefile	tty/powerpc: introduce the ePAPR embedded hypervisor byte channel driver	2011-08-23 10:32:56 -07:00
amiserial.c	tty: move the termios object into the tty	2012-07-16 13:00:41 -07:00
bfin_jtag_comm.c	TTY: bfin_jtag_comm, use tty from tty_port	2012-04-09 11:28:18 -07:00
cyclades.c	tty: move the termios object into the tty	2012-07-16 13:00:41 -07:00
ehv_bytechan.c	TTY: remove re-assignments to tty_driver members	2012-03-08 11:37:58 -08:00
isicom.c	tty: move the termios object into the tty	2012-07-16 13:00:41 -07:00
moxa.c	tty: move the termios object into the tty	2012-07-16 13:00:41 -07:00
moxa.h	tty: move a number of tty drivers from drivers/char/ to drivers/tty/	2011-02-22 16:14:56 -08:00
mxser.c	tty: move the termios object into the tty	2012-07-16 13:00:41 -07:00
mxser.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
n_gsm.c	tty: move the termios object into the tty	2012-07-16 13:00:41 -07:00
n_hdlc.c	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
n_r3964.c	tty: revert incorrectly applied lock patch	2012-07-16 12:58:12 -07:00
n_tracerouter.c	n_tracerouter and n_tracesink ldisc additions.	2011-05-13 16:31:00 -07:00
n_tracesink.c	n_tracerouter and n_tracesink ldisc additions.	2011-05-13 16:31:00 -07:00
n_tracesink.h	n_tracerouter and n_tracesink ldisc additions.	2011-05-13 16:31:00 -07:00
n_tty.c	tty: move the termios object into the tty	2012-07-16 13:00:41 -07:00
nozomi.c	TTY: remove re-assignments to tty_driver members	2012-03-08 11:37:58 -08:00
pty.c	tty: Fix race in tty release	2012-07-27 11:55:59 -07:00
rocket.c	tty: move the termios object into the tty	2012-07-16 13:00:41 -07:00
rocket.h	tty: move a number of tty drivers from drivers/char/ to drivers/tty/	2011-02-22 16:14:56 -08:00
rocket_int.h	tty: move a number of tty drivers from drivers/char/ to drivers/tty/	2011-02-22 16:14:56 -08:00
synclink.c	tty: move the termios object into the tty	2012-07-16 13:00:41 -07:00
synclink_gt.c	tty: move the termios object into the tty	2012-07-16 13:00:41 -07:00
synclinkmp.c	tty: move the termios object into the tty	2012-07-16 13:00:41 -07:00
sysrq.c	sysrq: use SEND_SIG_FORCED instead of force_sig()	2012-04-05 15:25:50 -07:00
tty_audit.c	tty_audit: fix tty_audit_add_data live lock on audit disabled	2011-03-07 12:04:50 -08:00
tty_buffer.c	tty: hold lock across tty buffer finding and buffer filling	2012-04-09 12:12:45 -07:00
tty_io.c	tty: Fix race in tty release	2012-07-27 11:55:59 -07:00
tty_ioctl.c	tty: Fix up PPC fallout from the termios move	2012-07-17 09:10:55 -07:00
tty_ldisc.c	tty: Fix race in tty release	2012-07-27 11:55:59 -07:00
tty_mutex.c	tty: revert incorrectly applied lock patch	2012-07-16 12:58:12 -07:00
tty_port.c	tty: move the termios object into the tty	2012-07-16 13:00:41 -07:00