]> 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, 14 Oct 2011 05:17:54 +0000 (16:17 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 14 Oct 2011 05:17:54 +0000 (16:17 +1100)
commit59adf4f81586a9e89b14eb3453545898717b3a81
treef45985c406175dd9d6d57da9aa02bdb5235e8057
parentc4aafa552a8fd14895c9e4226129ad10aa0cc2fa
parent53d785ccd918d571c227d459477793872676fc02
Merge remote-tracking branch 'tty/tty-next'

Conflicts:
arch/powerpc/include/asm/udbg.h
arch/powerpc/kernel/udbg.c
drivers/tty/serial/8250.c
29 files changed:
arch/arm/Kconfig
arch/arm/plat-s5p/Kconfig
arch/arm/plat-samsung/Kconfig
arch/arm/plat-samsung/Makefile
arch/arm/plat-samsung/include/plat/irqs.h
arch/powerpc/include/asm/udbg.h
arch/powerpc/kernel/udbg.c
arch/x86/platform/mrst/mrst.c
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/tty/Kconfig
drivers/tty/hvc/hvcs.c
drivers/tty/serial/8250.c
drivers/tty/serial/8250_pci.c
drivers/tty/serial/altera_jtaguart.c
drivers/tty/serial/altera_uart.c
drivers/tty/serial/atmel_serial.c
drivers/tty/serial/imx.c
drivers/tty/serial/lantiq.c
drivers/tty/serial/max3107.c
drivers/tty/serial/mrst_max3110.c
drivers/tty/serial/msm_serial.c
drivers/tty/serial/pch_uart.c
drivers/tty/serial/samsung.c
drivers/tty/serial/serial_core.c
drivers/tty/serial/sh-sci.c
drivers/tty/serial/uartlite.c
drivers/tty/serial/ucc_uart.c
include/linux/tty.h