]> 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, 7 Dec 2011 04:43:06 +0000 (15:43 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 Dec 2011 04:43:06 +0000 (15:43 +1100)
commit2eab3520b22c2a349e7e079bf09729030a19bb99
tree2ba3cf0f4b2310b67fbb327b23f7653a37a4858e
parentaa0a92665a174f0625fb2dc2810f9f83531bb6d5
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