Merge branch 'pci/reset'