Merge branch 'upstream-fixes'

Browse source

...

This commit is contained in:

Jeff Garzik 2006-04-20 17:55:24 -04:00

parent a7bb131899 fef6108d45

commit 1f5d5dbf03

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

56

drivers/net/gianfar.c

View file

67

drivers/net/gianfar.h

View file

20

drivers/net/gianfar_ethtool.c

View file

24

drivers/net/gianfar_sysfs.c

View file