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_beat.c

serial: Kill off NO_IRQ

2012-01-26 17:14:50 -08:00

hvc_bfin_jtag.c

hvc: add Blackfin JTAG console support

2011-02-17 11:12:40 -08:00

hvc_console.c

TTY: hvc, fix TTY refcounting

2012-04-13 10:54:43 -07:00

hvc_console.h

TTY: HVC, use count from tty_port

2012-04-09 11:28:18 -07:00

hvc_dcc.c

tty: hvc_dcc: Fix duplicate character inputs

2011-11-15 12:02:13 -08:00

hvc_irq.c

TTY: irq: Remove IRQF_DISABLED

2011-09-22 16:08:57 -07:00

hvc_iucv.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

hvc_opal.c

tty/hvc_opal: Fix debug function name

2012-07-10 19:16:25 +10:00

hvc_rtas.c

serial: Kill off NO_IRQ

2012-01-26 17:14:50 -08:00

hvc_tile.c

…

hvc_udbg.c

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

2012-03-21 18:55:10 -07:00

hvc_vio.c

powerpc+sparc/vio: Modernize driver registration

2012-03-28 11:33:24 +11:00

hvc_xen.c

xen/hvc: Fix up checks when the info is allocated.

2012-07-19 15:51:42 -04:00

hvcs.c

TTY: hvcs, use tty from tty_port

2012-04-09 11:28:21 -07:00

hvsi_lib.c

tty: move the termios object into the tty

2012-07-16 13:00:41 -07:00

hvsi.c

TTY: hvsi, use tty from tty_port

2012-04-09 11:28:26 -07:00

Kconfig

Features:

2012-03-22 20:16:14 -07:00

Makefile

tty: powerpc: remove hvc_iseries

2012-03-09 10:35:17 +11:00