Merge git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next

Browse source

...

This commit is contained in:

David S. Miller 2011-10-11 15:24:56 -04:00

parent 3ed6f6958c 077887c386

commit 258daca2bc

4 changed files with 411 additions and 334 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

3

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

View file

55

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

View file

14

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

View file

671

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

View file