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-05-07 22:57:22 -07:00

parent 0f020dec54 58f6bcf96e

commit 534eacb5d4

7 changed files with 100 additions and 96 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

66

drivers/net/e100.c

View file

3

drivers/net/e1000/e1000.h

View file

52

drivers/net/e1000/e1000_ethtool.c

View file

37

drivers/net/igb/igb_ethtool.c

View file

11

drivers/net/ixgbe/ixgbe_ethtool.c

View file

21

drivers/net/ixgbe/ixgbe_main.c

View file

8

drivers/net/ixgbe/ixgbe_type.h

View file