Merge branch 'pci/host-generic' of git://git.kernel.org/pub/scm/linux/kernel/git...