]> 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, 9 Dec 2011 04:01:59 +0000 (15:01 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Dec 2011 04:01:59 +0000 (15:01 +1100)
commitac4efdb5de7906042a5ba3ca4a57e1fcced8c41c
tree6fa941f415bc1d1d6fc78bff16ee82f8882d726b
parent1970a3b2bc2f944f6c1283211606b87311a2264a
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