Merge branch 'upstream-fixes' into upstream

Browse source

...

This commit is contained in:

Jeff Garzik 2006-07-29 01:24:00 -04:00

parent 7d2d8259a2 187ff3b857

commit d7446c0b52

2 changed files with 2 additions and 5 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/skge.c

View file