]> 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, 14 Dec 2011 04:52:40 +0000 (15:52 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Dec 2011 04:52:40 +0000 (15:52 +1100)
commitaca6f373a49b5c6b07387f64e11c67937795e479
tree3bdcb7252543c2728b63227d6b88232855c94aec
parent4e5f8d839e068ed9dec3d97944cf79a49958bfb2
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/pch_uart.c
include/linux/serial_core.h