diff options
author | David S. Miller <davem@davemloft.net> | 2014-02-14 02:27:33 +0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-02-14 02:27:33 +0400 |
commit | 0e42aa4fb0b6a2dc1aadbfca7a0457ee484fe6f9 (patch) | |
tree | bb4cbe883d811382378707b13edccc217009dafc /security/integrity | |
parent | 8815cbd9e38a7a02bfb79854aa7d33f1e1e50305 (diff) | |
parent | ef8693eb90ae38704569ba0e114859799eee1fed (diff) | |
download | linux-0e42aa4fb0b6a2dc1aadbfca7a0457ee484fe6f9.tar.xz |
Merge branch 'i40e'
Aaron Brown says:
====================
Intel Wired LAN Driver Updates
This series contains updates to i40e and i40evf, primarily reset
handling / refactoring along with a fair amount of minor cleanup.
Jesse fixes some spelling, bumps the version and other trivial fixes.
Akeem sets a bit that is needed before shutdown in the case of
tx_timeout recovery failure. Mitch refactors reset handling along
with a whole bunch of clean up.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'security/integrity')
0 files changed, 0 insertions, 0 deletions