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-10 23:16:35 -04:00

parent 01da0c2b03 eef4560f84

commit 74e04aca1a

14 changed files with 1370 additions and 245 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

11

drivers/net/ethernet/intel/Kconfig

View file

38

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

View file

2

drivers/net/ethernet/intel/ixgbe/Makefile

View file

37

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

View file

2

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

View file

67

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

View file

95

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

View file

98

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

View file

71

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

View file

198

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

View file

900

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

View file

13

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

View file

36

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

View file

47

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

View file