diff options
| author | David S. Miller <davem@davemloft.net> | 2017-02-09 17:09:20 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-02-09 17:09:20 -0500 |
| commit | 165f1cc0b5858b17cbb31312e861495f4500d9f0 (patch) | |
| tree | fd3c02c461fdeb60eb1ae3ab7470fcb92ec3399e /net/ipv4/netfilter/nf_defrag_ipv4.c | |
| parent | 15c2e102412d95af4fe88e5b28b3eba124545bbf (diff) | |
| parent | 038b9404d4e2db4fbc03d5d2203abafc6e188528 (diff) | |
Merge branch 'qcom-emac-more-ethtool'
Timur Tabi says:
====================
net: qcom/emac: add the last ethtool functions
These two patches implement the remaining two ethtool functions that
are of interest to the Qualcomm EMAC driver. These are the last
patches that will be submitted for the 4.11 merge window.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/netfilter/nf_defrag_ipv4.c')
0 files changed, 0 insertions, 0 deletions