diff options
| author | David S. Miller | 2014-03-13 15:02:16 -0400 |
|---|---|---|
| committer | David S. Miller | 2014-03-13 15:02:16 -0400 |
| commit | 50240dc37e5363cc8e8de34d931392263e38ca7d (patch) | |
| tree | e9651cbe49b69fa0a5cdcfb9823c1a4b8ef10376 /mm/slab_common.c | |
| parent | ca30be8057cee20e13a4f6ca3fbe13701d80380d (diff) | |
| parent | 2f586f6bcd5367fbbd1d3352d524a3ef3183eeb2 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Jeff Kirsher says:
====================
Intel Wired LAN Driver Updates
This series contains updates to igb, e1000e, ixgbe and ixgbevf.
Tom Herbert provides changes to e1000e, igb and ixgbe to call skb_set_hash()
to set the hash and its type in an skbuff.
Carolyn provides a fix for igb where using ethtool for EEE settings, which
was not working correctly.
Jacob provides some trivial cleanups and fixes for ixgbe which mainly
dealt with the file headers.
Julia Lawall provides a one fix for ixgbevf where the driver did not need
to adjust the power state on suspend, so the call to pci_set_power_state()
in the resume function was a no-op.
v2:
- dropped patches 4-6 from original series which implemented debugfs for
igb from Carolyn based on feed back from David Miller and Or Gerlitz
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'mm/slab_common.c')
0 files changed, 0 insertions, 0 deletions