]> git.karo-electronics.de Git - karo-tx-linux.git/commit
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)
commit66e3d0319e4cc2b5aac772404ca64af1418e875a
tree28805df15d660bb5d7ef395f9d87730510064806
parent1824e933bd4447bda2463bf309fc1ca4de846db7
parente26f1db9b8d74617519e50b41749900d0a257406
Merge remote-tracking branch 'tty/tty-next'

Conflicts:
arch/arm64/kernel/early_printk.c
Documentation/kernel-parameters.txt
arch/x86/Kconfig
drivers/tty/serial/8250/8250_core.c