[parisc-linux] [MERGE] trouble files

[Richard Hirst]

On Tue, May 23, 2000 at 08:07:50PM -0400, willy@thepuffingroup.com wrote:
> 
> the following list of files (if I remember to attach them this time...)
> are the files which have been modified in both the parisc tree and Linus'
> 2.3.99pre8 tree.  I've omitted the files where the rcs id is the only thing
> changed.

> drivers/net/82596.c

I don't believe we use that; I guess we started modifying it and then
created our own lasi_82596.c from it.  I'll check if anything that
changed in 82596.c needs feeding back in to lasi_82596.c.

Richard