]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tty/tty-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Dec 2011 04:55:21 +0000 (15:55 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Dec 2011 04:55:21 +0000 (15:55 +1100)
commitf806476c3a0baaa2d06ec1c33b4ce1dcebd0dfdc
tree4fb3141849c002fffad9d0c9a6e28fb25e9fcc9c
parentdba4d336e76d6ab569e6274bab8946aebaa13bee
parent64851636d568ae9f167cd5d1dcdbfe17e6eef73c
Merge remote-tracking branch 'tty/tty-next'

Conflicts:
drivers/tty/serial/Kconfig
drivers/tty/serial/Makefile
arch/x86/include/asm/mrst.h
arch/x86/kernel/early_printk.c
drivers/tty/serial/Kconfig
drivers/tty/serial/Makefile
drivers/tty/serial/omap-serial.c
drivers/tty/serial/pch_uart.c
include/linux/serial_core.h