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

Needed to keep the line commented

Conflicts:

	scripts/pciids-export

diff --cc scripts/pciids-export
index b3748d0d717810bdcbf9f104a7150b10f0c88767,001e599f7b7c09dd6c03a91348662b6ec2972734..b8ac82b5b7f1519294edf60283cf552da51b5a8e
--- 1/scripts/pciids-export
--- 2/scripts/pciids-export
+++ b/scripts/pciids-export
@@@ -26,9 -26,9 +26,9 @@@ cd per
  cat cf/class_head.ids >> ../pci.ids.new
  ./scripts/export.pl PD >> ../pci.ids.new
  cd ..
- if ! [ -f docs/pci.ids ] || ! cmp static/pci.ids pci.ids.new >/dev/null ; then
- #     ln pci.ids.new ~/origs/00-current
-       ln pci.ids.new docs/pci.ids
+ if ! [ -f docs/pci.ids ] || ! cmp docs/pci.ids pci.ids.new >/dev/null ; then
 -      ln -f pci.ids.new ~/origs/00-current
++#     ln -f pci.ids.new ~/origs/00-current
+       ln -f pci.ids.new docs/pci.ids
        bzip2 -9c <docs/pci.ids >docs/pci.ids.bz2
        gzip -9c <docs/pci.ids >docs/pci.ids.gz
  fi