Merge branch 'pci/irq'