Merge branch 'pci/sparc'