diff options
| author | David S. Miller <davem@davemloft.net> | 2015-03-14 15:08:02 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-14 15:08:02 -0400 |
| commit | 316ad4beecd6c9da181e3e8bd0718af22a215fc5 (patch) | |
| tree | e2ef130a641985fb383b566764b791aac3acaa24 /net/dsa | |
| parent | 6922022af529829645908bb6d11233c6579a2c49 (diff) | |
| parent | 0d8bb414cf51aa4fd847741233057da50f72a7a3 (diff) | |
| download | blackbird-obmc-linux-316ad4beecd6c9da181e3e8bd0718af22a215fc5.tar.gz blackbird-obmc-linux-316ad4beecd6c9da181e3e8bd0718af22a215fc5.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue
Jeff Kirsher says:
====================
Intel Wired LAN Driver Updates 2015-03-13
This series contains updates to ixgbe and ixgbevf.
Don adds additional support for X550 MAC types, which require additional
steps around enabling and disabling Rx. Also cleans up variable type
inconsistency.
I provide a patch to allow relaxed ordering to be enabled on SPARC
architectures. Also cleans up ixgbevf whitespace and code comments to
align the driver with networking coding standard. Lastly cleaned up
uses of memcpy() where ether_addr_copy() could have been used.
Alex removes some dead code in the ixgbe cleanup patch.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa')
0 files changed, 0 insertions, 0 deletions
