tree b4c9b385e18ae8128da1522055a17b453f2309fc
parent b0a478ede669949682b9c698f6146c0065543b91
parent d4ed11aa4881246e1e36e0189f30f053f140370c
author Michael Ellerman <mpe@ellerman.id.au> 1428967763 +1000
committer Michael Ellerman <mpe@ellerman.id.au> 1428967763 +1000

Merge branch 'next-sriov' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc into next

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