]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tty/tty-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 Dec 2011 06:47:57 +0000 (17:47 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 Dec 2011 06:47:57 +0000 (17:47 +1100)
commit7e6f181ad521308e7fb60c1f6f8600cd3e4a351b
tree0ad743d302008c53dee4df7f468cf5fa08874834
parentc385e15e6882a58c62280216c1a6eb0f7adf4a91
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