]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'tty/tty-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 6 May 2014 04:51:59 +0000 (14:51 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 6 May 2014 04:51:59 +0000 (14:51 +1000)
Conflicts:
arch/arm64/kernel/early_printk.c

1  2 
Documentation/kernel-parameters.txt
arch/x86/Kconfig
drivers/tty/serial/8250/8250_core.c

Simple merge
Simple merge
Simple merge