Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next

Browse source

Jeff Kirsher says:

====================
This series contains updates to igb and ixgbe.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2012-12-07 12:32:47 -05:00

parent 8caaf7b608 6699938bde

commit 1d9c5a04d5

7 changed files with 42 additions and 62 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

55

drivers/net/ethernet/intel/igb/igb_main.c

View file

2

drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c

View file

26

drivers/net/ethernet/intel/ixgbe/ixgbe_common.c

View file

1

drivers/net/ethernet/intel/ixgbe/ixgbe_common.h

View file

7

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

View file

11

drivers/net/ethernet/intel/ixgbe/ixgbe_type.h

View file

2

drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c

View file