diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2013-08-21 15:19:36 +0200 |
---|---|---|
committer | Ben Hutchings <bhutchings@solarflare.com> | 2013-08-21 15:19:36 +0200 |
commit | abc71bb939e3a789cc33ed46029bdff498bdc3a5 (patch) | |
tree | 704f50b386979e012591183ab2b1ba5280831dab /drivers/net/ethernet/sfc/io.h | |
parent | Merge branch 'openvswitch_vxlan' (diff) | |
parent | sfc: Fix lookup of default RX MAC filters when steered using ethtool (diff) | |
download | linux-abc71bb939e3a789cc33ed46029bdff498bdc3a5.tar.xz linux-abc71bb939e3a789cc33ed46029bdff498bdc3a5.zip |
Merge branch 'sfc-3.11'
Merge sfc fixes destined for 3.11 so we can avoid conflicts with
development for 3.12+.
Diffstat (limited to 'drivers/net/ethernet/sfc/io.h')
0 files changed, 0 insertions, 0 deletions