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

Browse source

...

This commit is contained in:

David S. Miller 2012-05-17 15:09:09 -04:00

parent a2a385d627 0c02dd983f

commit 046f4aaf6d

4 changed files with 11 additions and 26 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

30

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

View file

2

drivers/net/ethernet/intel/e1000e/defines.h

View file

2

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

View file

3

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

View file