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

Browse source

...

This commit is contained in:

Jeff Garzik 2006-05-23 17:21:33 -04:00

parent 9528454f9c 440c052d6f

commit bdad69b23c

5 changed files with 104 additions and 135 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

2

drivers/net/e1000/Makefile

View file

42

drivers/net/e1000/e1000_ethtool.c

View file

112

drivers/net/e1000/e1000_hw.c

View file

4

drivers/net/e1000/e1000_hw.h

View file

77

drivers/net/e1000/e1000_main.c

View file