Merge branch 'kvm-ppc-infrastructure' into kvm-ppc-next
authorPaul Mackerras <paulus@ozlabs.org>
Fri, 9 Sep 2016 06:24:23 +0000 (16:24 +1000)
committerPaul Mackerras <paulus@ozlabs.org>
Fri, 9 Sep 2016 06:24:23 +0000 (16:24 +1000)
commit99212c864e1f6d2800e62bc8c52d6335bfca029f
tree56ebe0f73108e9d7d6fcd36fda3f78db1b2e328d
parent2a27f514a47d39c50aaa5c07831ab35178955d47
parent3f2577749948803491874c6895fec559f3473eab
Merge branch 'kvm-ppc-infrastructure' into kvm-ppc-next

This merges the topic branch 'kvm-ppc-infrastructure' into kvm-ppc-next
so that I can then apply further patches that need the changes in the
kvm-ppc-infrastructure branch.

Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
arch/powerpc/kvm/Makefile