Merge remote-tracking branch 'tty/tty-next'

Conflicts:
	drivers/tty/serial/atmel_serial.c
	drivers/tty/serial/imx.c

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

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

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

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

diff --cc kernel/sysctl.c
Simple merge