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

Browse source

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

...

This commit is contained in:

David S. Miller 2011-08-20 17:25:36 -07:00

parent 6461be3a54 66f32a8b97

commit ca1ba7caa6

7 changed files with 445 additions and 359 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

3

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

View file

9

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

View file

199

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

View file

27

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

View file

2

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

View file

10

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

View file

572

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

View file