From: Michael Ellerman <mpe@ellerman.id.au>
Date: Mon, 13 Apr 2015 23:29:23 +0000 (+1000)
Subject: Merge branch 'next-sriov' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/power... 
X-Git-Tag: omap-for-v4.1/fixes-rc1~126^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad30cb9946515f72af5c3e89ad9de18870c1a1e7;p=pandora-kernel.git

Merge branch 'next-sriov' of git://git./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
---

ad30cb9946515f72af5c3e89ad9de18870c1a1e7
Reading git-diff-tree failed