Merge branch 'pci/printk'