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

Browse source

...

This commit is contained in:

David S. Miller 2011-10-07 12:34:52 -04:00

parent 5d6bcdfe38 ebe42d169b

commit d5b1d8cd8f

9 changed files with 600 additions and 521 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

12

drivers/net/ethernet/intel/e1000/e1000.h

View file

22

drivers/net/ethernet/intel/e1000/e1000_hw.c

View file

169

drivers/net/ethernet/intel/e1000/e1000_main.c

View file

2

drivers/net/ethernet/intel/e1000e/ich8lan.c

View file

2

drivers/net/ethernet/intel/igb/e1000_82575.h

View file

54

drivers/net/ethernet/intel/igb/igb.h

View file

16

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

View file

922

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

View file

4

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

View file