]> www.infradead.org Git - users/hch/uuid.git/commitdiff
projects / users / hch / uuid.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b8f3bff 50c4c4e)
Merge 4.15-rc3 into tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 11 Dec 2017 07:41:08 +0000 (08:41 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 11 Dec 2017 07:41:08 +0000 (08:41 +0100)
We want the serial/tty fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
drivers/tty/serdev/serdev-ttyport.c patch | diff1 | diff2 | blob | history
include/linux/serdev.h patch | diff1 | diff2 | blob | history

diff --cc drivers/tty/serdev/serdev-ttyport.c
Simple merge
diff --cc include/linux/serdev.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.