]> 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, 23 Sep 2011 04:34:50 +0000 (14:34 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 23 Sep 2011 04:34:50 +0000 (14:34 +1000)
commit2d9728f9befdd4fc9061840f16b7c6c840573f30
treeb797e5a35b32f6dc23bcbee123ec2ac648589478
parenteed779f087a327028688a4551dc0d3e0d2464eab
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