Merge branch 'RHEL5' of ssh://git.fedoraproject.org/git/hosted/hwdata into RHEL5
authorKarsten Hopp <karsten@redhat.com>
Fri, 19 Jun 2009 12:50:28 +0000 (14:50 +0200)
committerKarsten Hopp <karsten@redhat.com>
Fri, 19 Jun 2009 12:50:28 +0000 (14:50 +0200)
commit2caeffa924e53cf1ae9a77ecf9c924239f4f910f
tree698d01fc7ec950e936839b93171c4b589faca43d
parent5234b356387bf2d3c0c29bcaecd55f4f3a20c9ac
parentdd4d1533bf8700a6e1fc0615829282854fa1ee83
Merge branch 'RHEL5' of ssh://git.fedoraproject.org/git/hosted/hwdata into RHEL5

* 'RHEL5' of ssh://git.fedoraproject.org/git/hosted/hwdata:
  - Updated to latest pci.ids
  - Updated pci.ids and usb.ids

Conflicts:
hwdata.spec
pci.ids
usb.ids
pci.ids