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

[CVS User willy]

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

Log Message:
upstream version 2.2.4-pre2


Status:

Vendor Tag:	UPSTREAM
Release Tags:	PCIUTILS_2_2_4_PRE_2
		
C pciutils/lspci.c
C pciutils/Makefile
U pciutils/TODO
U pciutils/README
U pciutils/pciutils.h
U pciutils/pciutils.lsm
U pciutils/ChangeLog
U pciutils/setpci.c
U pciutils/common.c
U pciutils/pciutils.spec
U pciutils/lspci.man
U pciutils/setpci.man
U pciutils/update-pciids.man
U pciutils/update-pciids.sh
U pciutils/pci.ids
U pciutils/README.Windows
U pciutils/.git/description
U pciutils/.git/HEAD
U pciutils/.git/config
U pciutils/.git/index
U pciutils/.git/refs/heads/master
U pciutils/.git/refs/heads/origin
U pciutils/.git/refs/heads/public
U pciutils/.git/branches/origin
U pciutils/.git/branches/public
U pciutils/.git/hooks/applypatch-msg
U pciutils/.git/hooks/commit-msg
U pciutils/.git/hooks/post-commit
U pciutils/.git/hooks/post-update
U pciutils/.git/hooks/pre-applypatch
U pciutils/.git/hooks/pre-commit
U pciutils/.git/hooks/update
U pciutils/.git/hooks/pre-rebase
U pciutils/.git/info/exclude
U pciutils/.git/info/refs
U pciutils/.git/objects/pack/pack-b595e4b7fa5b074fa96284e6725c56866636ac3e.pack
U pciutils/.git/objects/pack/pack-b595e4b7fa5b074fa96284e6725c56866636ac3e.idx
U pciutils/.git/objects/info/packs
U pciutils/.git/objects/6e/4a5c60ad05d3db686536bd33a539e312cdc4a9
U pciutils/.git/objects/12/a9d487a67405a3f6ed0366814e8d5b8e75290d
U pciutils/.git/objects/21/4c1c815595f3e5c94e8ded967e8a54199e0566
U pciutils/.git/objects/8a/8301681d34ca9f29746e69178f7c28cd826a5d
U pciutils/.git/objects/27/c57a47383d32b2bd17554017f639516bf28650
U pciutils/.git/objects/4b/69e877d4e43e658c8225e28924b9270a69467f
U pciutils/.git/objects/81/f35df787e584bf18277a1e050e9b99338469b2
U pciutils/.git/objects/81/afa98cb906bf226765fff31a0c952a99eb204e
U pciutils/.git/objects/06/ba6ea36e08323010bd07bb7b8f25ffd846cc63
N pciutils/.git/objects/06/f804ef79667fedcd5989434422ce8cfb00d47c
U pciutils/.git/objects/1d/5cf727a564396ba51127140457ad9b6cedac7d
U pciutils/.git/objects/98/ee5621ac849d5178300bb7311fef6eb6afbf31
U pciutils/.git/objects/5f/173f36e051e37c44f33c49f20f310d3d7d335b
U pciutils/.git/objects/58/1ee65aab342772a8d0577514aba49097495478
U pciutils/.git/objects/58/015908a8532b315600b1521199dcb142d2c7e9
U pciutils/.git/objects/e6/54045f01b121eb7946b6322d8984987fb6954d
U pciutils/.git/objects/e6/f5388f0a411dc73abbc798749b5f6f6ffbcbd0
U pciutils/.git/objects/e6/0de20c9ee7813aa1ce0656cbd2fd65fcf2923c
U pciutils/.git/objects/2a/e2d1aed3fcb4ca01a8fdf8633eb83ad9cffeb0
U pciutils/.git/objects/3a/c84c2521f3b43abb7db5822c196f942aaa3823
U pciutils/.git/objects/6a/440d236a7a93648daa0e4405a16273f25c54aa
U pciutils/.git/objects/ba/3337c84c18c13b3ce5cb4f6f5573e3c0c17f78
U pciutils/.git/objects/2f/9b08ed9257ea376269549f290446e5279aff81
U pciutils/.git/objects/2f/294d4b425f37d76f34ea82e83b0ab61430bb64
U pciutils/.git/objects/d1/058e9dee26b0ae0f8a595e07bfdee20a5fecef
U pciutils/.git/objects/9d/aab4b5b3c824b3aa377043639fa5f78b39f673
U pciutils/.git/objects/32/28707a8e5a656f0a256970d246397385ef63b3
U pciutils/.git/objects/a1/b23f06b4add28d3f72de8c3c1501b22513bccb
U pciutils/.git/objects/0a/c282f2ed606726df8f8f2ebbdb1fd02943afab
U pciutils/.git/objects/85/f56559664a36ef35c0794d46ae90ff1f7e3c12
U pciutils/.git/objects/a7/b57c05911f5279cbdbb838e77375a3e34274d0
U pciutils/.git/objects/f7/69f7710072913c5e5ab4921842f2acf778c9cc
U pciutils/.git/objects/45/545e13ca67fa98ab5de157f4e0d7becafb6c3b
U pciutils/.git/objects/7d/52530e59873db82626d18ea5793b5d950529c0
U pciutils/.git/objects/f5/fd7cdef4e5b05453faf4368c1f1758a11a345c
U pciutils/.git/objects/d6/669af6ba131d35e1b2ce25be69739bbe310097
U pciutils/.git/objects/8f/2841c6529a046a59875d1a4fc2fcd9cee40b98
U pciutils/.git/objects/62/920f19b7e0051bb4315df23faaf12b71f98a7a
U pciutils/.git/objects/62/47337b6beec1605db6ebb4644c4eaaccd4dba6
U pciutils/.git/objects/7f/d6a5130a4e2df28e57d3646aaa51bea2360b23
U pciutils/.git/objects/cf/da85dc36aec7a3144ff0fbe44b856cecd0a48d
U pciutils/.git/objects/86/18df5408b2910bed5250be841c4ff4795c537d
U pciutils/.git/objects/84/a23e5b2b41b8718a64bf5114bf5bb08f835dc0
U pciutils/.git/objects/db/7fce8b0747a2d104382513866c4c418311b894
U pciutils/.git/objects/e1/a5e09af5e68d36cc3582e3c4702d8fecbd1e8b
U pciutils/.git/objects/bc/2eed2d4fab4369174d45ab7c07c5128c712e42
N pciutils/.git/objects/bc/0db71aa8f7ba6eb59225215b915c09b9b77b36
U pciutils/.git/objects/8b/b7b852a8997241b96c697d06bc41bda930cc44
U pciutils/.git/objects/64/6a9c08019acae09233904c2205b02bef345f3c
U pciutils/.git/objects/64/e34fdfd1e2ad2fda629f244d7d1fa7fcb8c3fb
U pciutils/.git/objects/22/c336bca7c992b8943c2f33ca165fe65dfe0ad3
U pciutils/.git/objects/40/7466c50f79f09c31eee7cd9fdb5fb34d681b2f
U pciutils/.git/objects/a4/2c0dad03f243301be7a7f06f1853dd4cdc6ef2
U pciutils/.git/objects/63/a4fc0f7e17c23348c0d8f9162a63b05326abda
U pciutils/.git/objects/80/acd81eae3bd1a6e5d1e343caa4729488c7b3a3
U pciutils/.git/objects/c7/2eedde22a9824769260acc8ad091846177c44e
U pciutils/.git/objects/38/c471eae58ea059d046ee5dd78c780a806b3de5
U pciutils/.git/objects/68/8b7cc53259bfbd3ab5990b274726fb0f05b1b3
U pciutils/.git/objects/9a/3bcebf9077d31914b05cedc4f3742484fd52bb
N pciutils/.git/objects/9a/d8a7c67c9c7f58c459ab2b8566597dbf0fb062
N pciutils/.git/objects/9e/c434dba659c64b7667b4ade177a84cc940add0
N pciutils/.git/objects/11/9c63dde1b19bc081208f4b90607d5af1b1a6b5
N pciutils/.git/objects/56/d6aaec340bcc9348ee970048f17b209219b286
N pciutils/.git/objects/d3/59092c396e14ede1988f4284fa2860798cf286
N pciutils/.git/objects/02/f9953337a9954cfdb876684415722395ca68e5
N pciutils/.git/objects/b1/b1c8ed01a32e329d8681beec4038125f2697e1
N pciutils/.git/objects/8c/208b406fdba92aea08ee6243e23c502a9d808f
N pciutils/.git/objects/a6/cbd57a6c753c278647fc2c859f1e4df475e18d
N pciutils/.git/objects/0d/7c3a8bd63015adea3bd15d81abd1e565d8c671
N pciutils/.git/objects/24/f5ea337fede15305f99720cb087795b7831a8a
N pciutils/.git/objects/c2/b144efd9a82291ca7b1bb4f561f427ff18ed7e
N pciutils/.git/objects/a2/703188110458df821f81ec1724fa798348b4e1
N pciutils/.git/objects/a2/fd618d6f661fb9b81e48a6842eb3cc12c4ab4d
N pciutils/.git/objects/ce/7cf77f602f92087ae88a2ff5496f29ad6e1680
N pciutils/.git/objects/e7/b5b667c1965243afad979abff7c2ba55fa0675
N pciutils/.git/objects/10/24e5be76c675f721ec1fcc37caf7bdf039f776
N pciutils/.git/objects/14/d4f9890a3a8073a855e496bba3c25699ee165f
N pciutils/.git/objects/1e/32eb4973f804645ee65d80f43e128f10820109
N pciutils/.git/objects/26/81f63c51337c8e79be6b6324abd5f6ca136feb
U pciutils/maint/release
U pciutils/maint/release.pm
C pciutils/lib/Makefile
U pciutils/lib/access.c
U pciutils/lib/header.h
U pciutils/lib/configure
U pciutils/lib/dump.c
U pciutils/lib/filter.c
U pciutils/lib/generic.c
U pciutils/lib/i386-ports.c
U pciutils/lib/internal.h
U pciutils/lib/names.c
C pciutils/lib/pci.h
U pciutils/lib/proc.c
U pciutils/lib/fbsd-device.c
C pciutils/lib/example.c
U pciutils/lib/aix-device.c
U pciutils/lib/nbsd-libpci.c
U pciutils/lib/i386-io-hurd.h
U pciutils/lib/i386-io-linux.h
U pciutils/lib/i386-io-sunos.h
U pciutils/lib/pread.h
C pciutils/lib/sysfs.c
U pciutils/lib/i386-io-windows.h
U pciutils/lib/sysdep.h
U pciutils/lib/types.h
U pciutils/lib/obsd-device.c
U pciutils/compat/README
U pciutils/compat/getopt.c
U pciutils/compat/getopt.h
U pciutils/win32/config.h

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

	cvs checkout -jUPSTREAM:yesterday -jUPSTREAM pciutils