]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c7a6b9e 085b775)
Merge 5.1-rc6 into tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 21 Apr 2019 21:20:08 +0000 (23:20 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 21 Apr 2019 21:20:08 +0000 (23:20 +0200)
We want the serial/tty fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
drivers/tty/serial/sc16is7xx.c patch | diff1 | diff2 | blob | history
drivers/tty/vt/vt.c patch | diff1 | diff2 | blob | history

diff --cc drivers/tty/serial/sc16is7xx.c
Simple merge
diff --cc drivers/tty/vt/vt.c
Simple merge
local clone of linux.git