Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net

Browse source

...

This commit is contained in:

David S. Miller 2012-05-04 10:55:50 -04:00

parent 0a6ba092d1 dd7f5c9e5c

commit 8af3994e23

6 changed files with 32 additions and 34 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/e1000/e1000_main.c

View file

4

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

View file

3

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

View file

43

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

View file

2

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

View file

10

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

View file