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 2011-12-05 18:27:28 -05:00

parent 17e6abeec4 560f20dad7

commit 5d91c2d00a

5 changed files with 80 additions and 71 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

1

drivers/net/ethernet/intel/e1000e/e1000.h

View file

27

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

View file

26

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

View file

96

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

View file

1

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

View file