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-10-23 13:26:30 -04:00

parent b3ce5ae1fb 1b3d2d77af

commit 5a85d716ab

5 changed files with 64 additions and 30 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

MAINTAINERS

View file

11

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

View file

20

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

View file

2

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

View file

59

drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c

View file