git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b0a478e d4ed11a)
Merge branch 'next-sriov' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/power...
authorMichael Ellerman <mpe@ellerman.id.au>
Mon, 13 Apr 2015 23:29:23 +0000 (09:29 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Mon, 13 Apr 2015 23:29:23 +0000 (09:29 +1000)
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


Trivial merge
Pandora Kernel Repository