Merge branch 'master' into next
[people/pmueller/ipfire-2.x.git] / src / hwdata /
drwxr-xr-x   ..
-rw-r--r-- 650881 pci.ids
-rw-r--r-- 407062 usb.ids