[kernel] bug#164: drivers/net/pcnet32.c is full of cvs conflicts

Richard Hirst <rhirst@linuxcare.com>, 164@bugs.parisc-linux.org Richard Hirst <rhirst@linuxcare.com>, 164@bugs.parisc-linux.org

X-PA-RISC Linux-PR-Message: report 164
X-PA-RISC Linux-PR-Package: kernel
X-Loop: daniel_frazier@hp.com
Received: via spool by bugs@bugs.parisc-linux.org id=B.10163734842317
          (code B ref -1); Sun, 17 Mar 2002 14:03:02 GMT
Date: Sun, 17 Mar 2002 13:43:00 +0000
From: Richard Hirst <rhirst@linuxcare.com>
To: submit@bugs.parisc-linux.org
Message-ID: <20020317134300.GM21376@sleepie.demon.co.uk>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.3.24i

package: kernel
version: 2.4.18

Looks like the conflicts in pcnet32.c were not resolved before commiting
the last merge.