Documentation/virtual/kvm/api.txt · facb0139698923dc7b7d15cafbb319219969f4fd · jan.koester / Linux · GitLab

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