Merge branch 'topic/ppc-kvm' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git

# Conflicts:
#	Documentation/arch/powerpc/kvm-nested.rst

Author: sfrothwell

Documentation/arch/powerpc/index.rst

@@ -26,6 +26,7 @@ powerpc
     isa-versions
     kaslr-booke32
     mpc52xx
+    kvm-nested
     papr_hcalls
     pci_iov_resource_on_powernv
     pmu-ebb