]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tty/tty-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 Sep 2011 03:42:19 +0000 (13:42 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 Sep 2011 03:42:19 +0000 (13:42 +1000)
commitea03f1eb9952843a9dfbfb34cceb337279a5ed91
tree8c3d9062d9344fcad0b648d15ed79d3ac4d5e070
parentd54f751a916a2d2e2f9489fbd537e939064a8202
parent7d4008ebb1c971ce4baf57e45993690b0fa6d9f9
Merge remote-tracking branch 'tty/tty-next'

Conflicts:
arch/powerpc/include/asm/udbg.h
arch/powerpc/kernel/udbg.c
drivers/tty/serial/8250.c
17 files changed:
arch/arm/Kconfig
arch/arm/plat-s5p/Kconfig
arch/arm/plat-samsung/Kconfig
arch/arm/plat-samsung/Makefile
arch/powerpc/include/asm/udbg.h
arch/powerpc/kernel/udbg.c
arch/x86/platform/mrst/mrst.c
drivers/tty/Kconfig
drivers/tty/hvc/hvcs.c
drivers/tty/serial/8250.c
drivers/tty/serial/atmel_serial.c
drivers/tty/serial/imx.c
drivers/tty/serial/mrst_max3110.c
drivers/tty/serial/msm_serial.c
drivers/tty/serial/samsung.c
drivers/tty/serial/serial_core.c
include/linux/tty.h