Merge branch 'RHEL4' of ssh://git.fedorahosted.org/git/hwdata into RHEL4 hwdata-0.146.33.EL-12
authorPhilip Knirsch <pknirsch@hamburg.stuttgart.redhat.com>
Mon, 19 Jan 2009 18:50:07 +0000 (19:50 +0100)
committerPhilip Knirsch <pknirsch@hamburg.stuttgart.redhat.com>
Mon, 19 Jan 2009 18:50:07 +0000 (19:50 +0100)
commit1770bee7f28f28ac73008ff495aae0e7bceff6d5
tree360e49eb1685db0095ab3e9bd65709f2c8804246
parent6e050ab2032428f2a18f6c5f00e1067dc3bab340
parent1490615d3ba83bab34cb3c30fcec41fe7d1346f7
Merge branch 'RHEL4' of ssh://git.fedorahosted.org/git/hwdata into RHEL4

Conflicts:
hwdata.spec
pci.ids
usb.ids