Re: CVS commit: src/sys/dev/pci

[Tom Spindler <dogcow%NetBSD.org@localhost>]

On Mon, Jul 09, 2007 at 07:38:52PM +0000, DEGROOTE Arnaud wrote:
> 
> Module Name:  src
> Committed By: degroote
> Date:         Mon Jul  9 19:38:52 UTC 2007
> 
> Modified Files:
>       src/sys/dev/pci: if_wpi.c [...]
> 

This has multiple CVS conflicts committed into it - e.g.
<<<<<<< if_wpi.c
        if ((error = wpi_load_firmware(sc)) != 0) {
                aprint_error("%s: could not load firmware\n", 
sc->sc_dev.dv_xname);
=======