diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-09-21 09:23:55 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-09-21 09:23:55 +0200 |
commit | 33f16b25a091687388152d4b29593a39d819aa22 (patch) | |
tree | 34a8ef8acf3f14ca0e4f514756222876d00ff202 /drivers/net/sb1000.c | |
parent | sticon: remove no-op sticon_set_origin() (diff) | |
parent | Linux 5.9-rc6 (diff) | |
download | linux-33f16b25a091687388152d4b29593a39d819aa22.tar.xz linux-33f16b25a091687388152d4b29593a39d819aa22.zip |
Merge 5.9.0-rc6 into tty-next
We need the tty/serial fixes in here and this resolves a merge issue in
the 8250 driver.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/sb1000.c')
0 files changed, 0 insertions, 0 deletions