Merge branch 'upstream-fixes' into upstream

Browse source

...

This commit is contained in:

Jeff Garzik 2006-08-10 08:31:03 -04:00

parent e714d99cac 8d3d35b4e2

commit f5c7db1c91

2 changed files with 3 additions and 4 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/myri10ge/myri10ge.c

View file

5

drivers/net/sky2.c

View file