]> 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, 19 Dec 2011 06:07:26 +0000 (17:07 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Dec 2011 06:07:26 +0000 (17:07 +1100)
commit7877ae2c27e309bdbe36c33a38a73a81c8b798bf
tree0f4862f13e89e0ec1226107f5d9050882fa7269a
parentd1e9b168fc129ce13c6c488934efb85149244497
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