projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eafd370 e26f1db)
Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty...
authorRob Herring <robh@kernel.org>
Tue, 20 May 2014 19:22:54 +0000 (14:22 -0500)
committerRob Herring <robh@kernel.org>
Tue, 20 May 2014 19:22:54 +0000 (14:22 -0500)
Conflicts:
arch/arm64/kernel/early_printk.c

1  2 
drivers/tty/serial/8250/8250_core.c patch | diff1 | diff2 | blob | history

diff --cc drivers/tty/serial/8250/8250_core.c
Simple merge
John Crispins staging tree