projects / oweals / hwdata.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2736304 1f6f387)
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)
* 'RHEL5' of ssh://git.fedoraproject.org/git/hosted/hwdata:
  - update pci.ids, usb.ids

Conflicts:
hwdata.spec
pci.ids
usb.ids


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.