Merge branch 'master' of /home/vorner/pciids

diff --cc scripts/pciids-export
index 1f99588b5cbee3013c22c68752113b894ad18629,adb35433d18d57d27cde7cc0a46f299d81435770..b459305376f09c085db6b9d8c39b4f70c656bf55
--- 1/scripts/pciids-export
--- 2/scripts/pciids-export
+++ b/scripts/pciids-export
@@@ -30,9 -30,9 +30,9 @@@ if ! [ -f docs/pci.ids.nohead ] || ! cm
        echo '# Version: '`date +%Y%m%d` >> pci.ids.final
        echo >> pci.ids.final
        cat pci.ids.new >> pci.ids.final
 -      ln -f pci.ids.final ~/origs/00-current
 +#     ln -f pci.ids.final ~/origs/00-current
        ln -f pci.ids.final docs/pci.ids
-       ln -f pci.ids docs/pci.ids.nohead
+       ln -f pci.ids.new docs/pci.ids.nohead
        rm pci.ids.final
        bzip2 -9c <docs/pci.ids >docs/pci.ids.bz2
        gzip -9c <docs/pci.ids >docs/pci.ids.gz