]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tty/tty-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 05:40:53 +0000 (16:40 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 05:40:53 +0000 (16:40 +1100)
commit70b3fb6b4654b6f328b694d60c9e5be605b79f5e
treefe019f205793fc164c74b34b22037116a2d46c9c
parentb34da51a41e50d440f05666a32e1f9215aac37a2
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