Merge git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net

Browse source

...

This commit is contained in:

David S. Miller 2011-11-03 21:52:51 -04:00

parent eea49cc900 c1a7e1ebc1

commit 5b67b3c04d

8 changed files with 45 additions and 46 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

4

drivers/net/ethernet/intel/e100.c

View file

3

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

View file

2

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

View file

20

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

View file

10

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

View file

48

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

View file

2

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

View file

2

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

View file