| commit | ad30cb9946515f72af5c3e89ad9de18870c1a1e7 | [log] [tgz] |
|---|---|---|
| author | Michael Ellerman <mpe@ellerman.id.au> | Tue Apr 14 09:29:23 2015 +1000 |
| committer | Michael Ellerman <mpe@ellerman.id.au> | Tue Apr 14 09:29:23 2015 +1000 |
| tree | b4c9b385e18ae8128da1522055a17b453f2309fc | |
| parent | b0a478ede669949682b9c698f6146c0065543b91 [diff] | |
| parent | d4ed11aa4881246e1e36e0189f30f053f140370c [diff] |
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