]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 7 Sep 2012 04:23:51 +0000 (14:23 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 7 Sep 2012 04:23:51 +0000 (14:23 +1000)
commitc448a9f2994a5203969c2b214998590666c33a88
tree99205e3a9ddde28f54cf4553148d41c05f54c6fc
parentc63605cb21a14df840bd55563019b48fef0808e6
parente9908a44fe2cb5a2178fab44f4cefeb8cca4f04a
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'

Conflicts:
arch/powerpc/include/asm/kvm_ppc.h
arch/powerpc/kvm/e500_tlb.c
include/linux/kvm.h
Documentation/virtual/kvm/api.txt
include/linux/kvm.h
include/linux/kvm_host.h