arch/powerpc/kvm/book3s_pr.c · b73117c49364551ff789db7c424a115ac5b77850 · Kirill Smelkov / linux · GitLab

Find file Blame History Permalink

Merge branch 'kvm-ppc-next' of git://github.com/agraf/linux-2.6 into kvm-queue · b73117c4
Paolo Bonzini authored Jan 29, 2014
```
Conflicts:
	arch/powerpc/kvm/book3s_hv_rmhandlers.S
	arch/powerpc/kvm/booke.c
```
b73117c4

book3s_pr.c 39.1 KB