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-04-14 15:17:54 -04:00

parent 87b6d218f3 8f56e4b9ab

commit 7f83560df2

12 changed files with 62 additions and 58 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/e100.c

View file

4

drivers/net/ethernet/intel/e1000e/80003es2lan.c

View file

9

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

View file

19

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

View file

26

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

View file

2

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

View file

2

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

View file

8

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

View file

23

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

View file

4

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

View file

18

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

View file

1

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

View file