Merge branch 'upstream-fixes'

Browse source

...

This commit is contained in:

Jeff Garzik 2006-01-27 11:09:39 -05:00

parent cca4aa83c7 6651a5c383

commit cfc88b0729

2 changed files with 49 additions and 63 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

4

arch/ppc/syslib/mv64x60.c

View file

106

drivers/net/mv643xx_eth.c

View file