Michael Ellerman ce57c6610c Merge branch 'topic/ppc-kvm' into next ... Merge in some commits we're sharing with the KVM tree. I manually propagated the change from commit d3d4ffaae4 ("powerpc/powernv/ioda2: Reduce upper limit for DMA window size") into pci-ioda-tce.c. Conflicts: arch/powerpc/include/asm/cputable.h arch/powerpc/platforms/powernv/pci-ioda.c arch/powerpc/platforms/powernv/pci.h		2018-07-19 14:37:57 +10:00
..
asm	Merge branch 'topic/ppc-kvm' into next	2018-07-19 14:37:57 +10:00
uapi/asm	powerpc: Wire up io_pgetevents	2018-06-23 21:43:21 +10:00