Merge branch 'kvm-ppc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus...
authorPaolo Bonzini <pbonzini@redhat.com>
Mon, 11 Jul 2016 16:10:06 +0000 (18:10 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Mon, 11 Jul 2016 16:10:06 +0000 (18:10 +0200)
commit6d5315b3a60cc9b136b86b4dafeb73bf272d24c0
treee84da27738b855bd268fec8f1ae23cec5f019dab
parent8391ce447f18476273331399a7f5930e5494bf46
parentfd7bacbca47a86a6f418440d8a5d7b7edbb2f8f9
Merge branch 'kvm-ppc-next' of git://git./linux/kernel/git/paulus/powerpc into HEAD
arch/powerpc/kvm/book3s_hv.c
arch/powerpc/kvm/book3s_pr.c