diff options
author | David S. Miller <davem@davemloft.net> | 2019-04-26 05:52:29 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-04-26 05:52:29 +0200 |
commit | 8b4483658364f05b2e32845c8f445cdfd9452286 (patch) | |
tree | 4734ef83378b1e90475ec4776ac72dfe16a7249b /fs/devpts | |
parent | net: sched: flower: refactor reoffload for concurrent access (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
download | linux-8b4483658364f05b2e32845c8f445cdfd9452286.tar.xz linux-8b4483658364f05b2e32845c8f445cdfd9452286.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Two easy cases of overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs/devpts')
0 files changed, 0 insertions, 0 deletions