Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6