Merge branch 'x86/unify-pci' into x86/core