Merge 3.10-rc3 into tty-next

We want these fixes.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc drivers/tty/n_tty.c
Simple merge

diff --cc drivers/tty/serial/amba-pl011.c
Simple merge

diff --cc drivers/tty/serial/mpc52xx_uart.c
Simple merge

diff --cc drivers/tty/serial/omap-serial.c
Simple merge

diff --cc drivers/tty/vt/vt.c
Simple merge

diff --cc include/linux/vt_kern.h
Simple merge