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

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/plat-samsung/Makefile
Simple merge

diff --cc arch/x86/platform/mrst/mrst.c
Simple merge

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

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

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

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

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

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

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