[Pkg-pciutils-commits] CVS %{sVv}

[CVS User willy]

Update of /cvsroot/pkg-pciutils/pciutils
In directory haydn:/tmp/cvs-serv4302

Log Message:
Upstream version 2.2.4-pre4

Status:

Vendor Tag:	UPSTREAM
Release Tags:	PCIUTILS_2_2_4_PRE_4
		
U pciutils/README.Windows
U pciutils/pci.ids
U pciutils/update-pciids.sh
U pciutils/update-pciids.man
U pciutils/setpci.man
U pciutils/lspci.man
U pciutils/pciutils.spec
U pciutils/common.c
U pciutils/setpci.c
U pciutils/ChangeLog
U pciutils/pciutils.lsm
U pciutils/pciutils.h
U pciutils/README
U pciutils/TODO
C pciutils/Makefile
C pciutils/lspci.c
U pciutils/win32/config.h
U pciutils/compat/getopt.h
U pciutils/compat/getopt.c
U pciutils/compat/README
U pciutils/lib/obsd-device.c
U pciutils/lib/types.h
U pciutils/lib/sysdep.h
U pciutils/lib/i386-io-windows.h
U pciutils/lib/sysfs.c
U pciutils/lib/pread.h
U pciutils/lib/i386-io-sunos.h
U pciutils/lib/i386-io-linux.h
U pciutils/lib/i386-io-hurd.h
U pciutils/lib/nbsd-libpci.c
U pciutils/lib/aix-device.c
U pciutils/lib/example.c
U pciutils/lib/fbsd-device.c
U pciutils/lib/proc.c
U pciutils/lib/pci.h
U pciutils/lib/names.c
U pciutils/lib/internal.h
U pciutils/lib/i386-ports.c
U pciutils/lib/generic.c
U pciutils/lib/filter.c
U pciutils/lib/dump.c
U pciutils/lib/configure
U pciutils/lib/header.h
U pciutils/lib/access.c
C pciutils/lib/Makefile
U pciutils/maint/release.pm
U pciutils/maint/release

3 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jUPSTREAM:yesterday -jUPSTREAM pciutils