]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tty/tty-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 27 Sep 2011 05:53:52 +0000 (15:53 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 27 Sep 2011 05:53:52 +0000 (15:53 +1000)
commit691ef3754b4bbe19040a33c2c2ee081aa5963e72
tree2c5708105204412d2309091f6dd911ef43a0934f
parent9c78627ce28b94fe197f5369c6904e3aa35bba23
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