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

Browse source

...

This commit is contained in:

David S. Miller 2011-02-08 12:16:52 -08:00

parent e0985f27dd 310e5ca82a

commit 3fb17dabf6

8 changed files with 21 additions and 14 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/e1000/e1000_hw.c

View file

1

drivers/net/e1000/e1000_hw.h

View file

1

drivers/net/e1000e/netdev.c

View file

3

drivers/net/ixgbe/ixgbe_common.c

View file

2

drivers/net/ixgbe/ixgbe_fcoe.c

View file

16

drivers/net/ixgbe/ixgbe_main.c

View file

2

drivers/net/ixgbe/ixgbe_sriov.c

View file

6

drivers/net/ixgbe/ixgbe_x540.c

View file