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

Browse source

...

This commit is contained in:

David S. Miller 2011-06-23 23:39:33 -07:00

parent d18cd551d1 a38a104d7a

commit 21e842579a

6 changed files with 850 additions and 456 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

29

drivers/net/ixgbe/ixgbe.h

View file

625

drivers/net/ixgbe/ixgbe_82599.c

View file

13

drivers/net/ixgbe/ixgbe_dcb_nl.c

View file

558

drivers/net/ixgbe/ixgbe_ethtool.c

View file

89

drivers/net/ixgbe/ixgbe_main.c

View file

28

drivers/net/ixgbe/ixgbe_type.h

View file