Merge branch 'upstream-fixes' into upstream

Browse source

...

This commit is contained in:

Jeff Garzik 2006-05-02 15:26:21 -04:00

parent 5d3213cc8f ebf34c9b6f

commit 753a6c4ff4

3 changed files with 236 additions and 84 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

312

drivers/net/forcedeth.c

View file

2

drivers/net/mv643xx_eth.c

View file

6

drivers/net/via-rhine.c

View file