-
git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpcMichael Ellerman authored
Merge Richard's work to support SR-IOV on PowerNV. All generic PCI patches acked by Bjorn. Some minor conflicts with Daniel's pci_controller_ops work. Conflicts: arch/powerpc/include/asm/machdep.h arch/powerpc/platforms/powernv/pci-ioda.c
ad30cb99