diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2015-04-14 01:29:23 +0200 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2015-04-14 01:29:23 +0200 |
| commit | ad30cb9946515f72af5c3e89ad9de18870c1a1e7 (patch) | |
| tree | b4c9b385e18ae8128da1522055a17b453f2309fc /kernel/module.c | |
| parent | powerpc/pseries: Correct memory hotplug locking (diff) | |
| parent | Merge branch 'next-eeh' into next-sriov (diff) | |
| download | linux-ad30cb9946515f72af5c3e89ad9de18870c1a1e7.tar.xz linux-ad30cb9946515f72af5c3e89ad9de18870c1a1e7.zip | |
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
Diffstat (limited to 'kernel/module.c')
0 files changed, 0 insertions, 0 deletions