Merge git://github.com/Jkirsher/net-next

Browse source

...

This commit is contained in:

David S. Miller 2011-09-29 15:41:20 -04:00

parent f9b491ecc4 0ccb974df5

commit 3869f80605

12 changed files with 358 additions and 227 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

6

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

View file

25

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

View file

8

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

View file

12

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

View file

1

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

View file

9

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

View file

8

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

View file

153

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

View file

4

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

View file

289

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

View file

64

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

View file

6

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

View file