Automatic merge of /spare/repo/netdev-2.6 branch viro

Browse source

...

This commit is contained in:

2005-06-04 17:07:40 -04:00 • committed by Jeff Garzik

parent 7f6a57a907 99417769ba

commit 105adfc63f

2 changed files with 18 additions and 15 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

16

drivers/net/arm/etherh.c

View file

17

drivers/net/pcmcia/pcnet_cs.c

View file