]> 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, 6 Dec 2011 02:24:29 +0000 (13:24 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 6 Dec 2011 02:24:29 +0000 (13:24 +1100)
commitb38635504cd4cf502b1a2051f553e3d04519f280
tree784f986b7931cfb900c933fc8c4c3f56f36618b8
parent759d63aeab554195de18bb41bc86c0f42a7ccdec
parent7962fce9a052f34390b6dab9f11df1d2e48c138d
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