Olof Johansson 0f9cb211ba Merge tag 'v3.7-rc7' into next/cleanup ...

Merging in mainline back to next/cleanup since it has collected a few
conflicts between fixes going upstream and some of the cleanup patches.
Git doesn't auto-resolve some of them, and they're mostly noise so let's
take care of it locally.

Conflicts are in:
	arch/arm/mach-omap2/omap_hwmod_44xx_data.c
	arch/arm/plat-omap/i2c.c
	drivers/video/omap2/dss/dss.c

Signed-off-by: Olof Johansson <olof@lixom.net>

2012-11-25 21:34:34 -08:00

..

hvc

TTY: hvc_console, fix port reference count going to zero prematurely

2012-11-14 12:27:29 -08:00

ipwireless

Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq

2012-10-02 09:54:49 -07:00

serial

Merge tag 'v3.7-rc7' into next/cleanup

2012-11-25 21:34:34 -08:00

vt

TTY: vt, fix paste_selection ldisc handling

2012-10-22 16:50:53 -07:00

amiserial.c

serial: add a new helper function

2012-09-05 13:28:35 -07:00

bfin_jtag_comm.c

TTY: use tty_port_link_device

2012-08-13 16:50:19 -07:00

cyclades.c

serial: add a new helper function

2012-09-05 13:28:35 -07:00

ehv_bytechan.c

TTY: use tty_port_register_device

2012-08-13 16:50:19 -07:00

isicom.c

serial: add a new helper function

2012-09-05 13:28:35 -07:00

Kconfig

tty/serial: put (EXPERIMENTAL) marking back on N_GSM and SERIAL_IFX6X60

2012-09-18 17:17:56 +01:00

Makefile

tty/powerpc: introduce the ePAPR embedded hypervisor byte channel driver

2011-08-23 10:32:56 -07:00

moxa.c

TTY: tty_alloc_driver() returns error pointers

2012-08-16 12:07:23 -07:00

moxa.h

…

mxser.c

serial: add a new helper function

2012-09-05 13:28:35 -07:00

mxser.h

Fix common misspellings

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

n_gsm.c

tty: n_gsm: Fix incorrect debug display

2012-09-17 04:45:30 -07:00

n_hdlc.c

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

n_r3964.c

tty: localise the lock

2012-08-10 12:55:47 -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 tty buffers to tty_port

2012-10-22 16:58:28 -07:00

nozomi.c

TTY: use tty_port_register_device

2012-08-13 16:50:19 -07:00

pty.c

TTY: move tty buffers to tty_port

2012-10-22 16:58:28 -07:00

rocket_int.h

…

rocket.c

TTY: use tty_port_register_device

2012-08-13 16:50:19 -07:00

rocket.h

…

synclink_gt.c

serial: add a new helper function

2012-09-05 13:28:35 -07:00

synclink.c

serial: add a new helper function

2012-09-05 13:28:35 -07:00

synclinkmp.c

serial: add a new helper function

2012-09-05 13:28:35 -07:00

sysrq.c

sparc64: Add global PMU register dumping via sysrq.

2012-10-16 09:34:01 -07:00

tty_audit.c

TTY: audit, stop accessing tty->icount

2012-10-22 16:50:54 -07:00

tty_buffer.c

TTY: Report warning when low_latency flag is wrongly used

2012-10-24 11:21:32 -07:00

tty_io.c

TTY: move tty buffers to tty_port

2012-10-22 16:58:28 -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: move tty buffers to tty_port

2012-10-22 16:58:28 -07:00

tty_mutex.c

tty: localise the lock

2012-08-10 12:55:47 -07:00

tty_port.c

TTY: move tty buffers to tty_port

2012-10-22 16:58:28 -07:00