Merge git://github.com/Jkirsher/net-next

Browse source

...

This commit is contained in:

David S. Miller 2011-09-16 15:18:02 -04:00

parent 9c223f9bba 2c4af694fe

commit e3b37a1bda

7 changed files with 341 additions and 580 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

2

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

View file

13

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

View file

40

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

View file

18

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

View file

787

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

View file

1

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

View file

72

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

View file