summaryrefslogtreecommitdiff
path: root/drivers/tty/serial/jsm
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-01-02 17:10:07 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-01-02 17:10:07 +0300
commit69c444ba93b76f2da4f23449c72e83521142b243 (patch)
tree4d460a117b909ed5d38cf01e00b95f01b4bbb68c /drivers/tty/serial/jsm
parent2b022ab7542df60021ab57854b3faaaf42552eaf (diff)
parent30a7acd573899fd8b8ac39236eff6468b195ac7d (diff)
downloadlinux-69c444ba93b76f2da4f23449c72e83521142b243.tar.xz
Merge 4.15-rc6 into tty-next
We want the ldisc fix here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/jsm')
0 files changed, 0 insertions, 0 deletions