diff options
author | David S. Miller <davem@davemloft.net> | 2015-01-25 16:02:33 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-01-25 16:02:33 -0800 |
commit | 5c66cfe0780d02af6c1c64fdb655a85921855bee (patch) | |
tree | ffedce71dac53a1526ed0abca5a67a90a7317269 /net/ipv6/netfilter.c | |
parent | c2943f14534bdc4230f4da6dcd4ea03c5d8c8162 (diff) | |
parent | 691c9a8fdcbbb27682f151a23e36df35fc250c03 (diff) | |
download | linux-5c66cfe0780d02af6c1c64fdb655a85921855bee.tar.bz2 |
Merge branch 'phy_dsa'
Florian Fainelli says:
====================
net: phy and dsa random fixes/cleanups
These two patches were already present as part of my attempt to make
DSA modules work properly, these are the only two "valid" patches at
this point which should not need any further rework.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/netfilter.c')
0 files changed, 0 insertions, 0 deletions