]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tty/tty-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 29 Sep 2011 05:25:13 +0000 (15:25 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 29 Sep 2011 05:25:13 +0000 (15:25 +1000)
commit3ec456146e4445f466dca61088d0a65d26402553
tree7e229b15cfeb16016c9b45958bf7e48dd80b19c8
parentab3b7cd82c7c59433791a04a4195f305f6192b75
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