Merge branch 'upstream-fixes' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into upstream-fixes

Browse source

...

This commit is contained in:

Jeff Garzik 2007-01-07 22:33:56 -05:00

parent bf81b46482 a3ffab8758

commit 81ebd49888

4 changed files with 55 additions and 7 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

1

drivers/net/ixgb/ixgb.h

View file

1

drivers/net/ixgb/ixgb_ethtool.c

View file

3

drivers/net/ixgb/ixgb_hw.c

View file

57

drivers/net/ixgb/ixgb_main.c

View file