| commit | 07cb1c175e45b649daff5ec46012934904b8b07e | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Fri Feb 28 12:42:13 2014 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Fri Feb 28 12:42:13 2014 -0500 |
| tree | 608c6f7ace4c09acf1ffad3ebe647ca50bfe9689 | |
| parent | bc861959103cb5ca43157db6ddb83d1e17e9c38a [diff] | |
| parent | 01a545cf21e7514f0b384328e6387e637a07e333 [diff] |
Merge branch 'intel-next' Aaron Brown says: ==================== This series contains updates to ixgbe and ixgbevf. Don provides an update to change a hard coded timeout interval to a system-wide timeout one, collects AUTOC register functions into one place and fixes some firmware bit handling. Emil resolves a tx handling error introduced in a recent commit and adds check for CHECKSUM_PARTIAL to avoid an skb_is_gso check ==================== Signed-off-by: David S. Miller <davem@davemloft.net>