diff options
author | David S. Miller <davem@davemloft.net> | 2019-10-20 08:51:25 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-10-20 20:43:00 +0300 |
commit | 2f184393e0c2d409c62262f57f2a57efdf9370b8 (patch) | |
tree | 25b96db2550014d7f888605abfabb67a7f40a5d3 /drivers/tty/serial/8250/8250_boca.c | |
parent | ebcd670d05d54ff8d17a1a51bba1ec1e4069d949 (diff) | |
parent | 531e93d11470aa2e14e6a3febef50d9bc7bab7a1 (diff) | |
download | linux-2f184393e0c2d409c62262f57f2a57efdf9370b8.tar.xz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Several cases of overlapping changes which were for the most
part trivially resolvable.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/tty/serial/8250/8250_boca.c')
0 files changed, 0 insertions, 0 deletions