]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tty/tty-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Dec 2011 03:24:12 +0000 (14:24 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Dec 2011 03:24:12 +0000 (14:24 +1100)
commit6f0b6ad5b567111197945a2bc37356df5f8d9739
treefadc469236f0822b2a7f93af2d9b762765fff68b
parenta7a62b833f6dac4c28bf270896791322fc2922d7
parent9deaa53ac7fa373623123aa4f18828dd62292b1a
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