Merge branch 'RHEL5' of ssh://git.fedoraproject.org/git/hosted/hwdata into RHEL5
authorKarsten Hopp <karsten@redhat.com>
Tue, 15 Dec 2009 14:34:01 +0000 (15:34 +0100)
committerKarsten Hopp <karsten@redhat.com>
Tue, 15 Dec 2009 14:34:01 +0000 (15:34 +0100)
commitb129d7b3163a8a1bbdbb90ec915c46bae615aed3
tree76e61eb1c73d96bc54159cf91b44517e2cd9e5c0
parent273630423759527d0a8dca6514d8f126c6a3aa8c
parent1f6f3878b400be4cbce24b7592d49fe72c8f988b
Merge branch 'RHEL5' of ssh://git.fedoraproject.org/git/hosted/hwdata into RHEL5

* 'RHEL5' of ssh://git.fedoraproject.org/git/hosted/hwdata:
  - update pci.ids, usb.ids

Conflicts:
hwdata.spec
pci.ids
usb.ids