]> 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, 12 Oct 2012 02:13:52 +0000 (13:13 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 12 Oct 2012 02:13:52 +0000 (13:13 +1100)
commit9ce2b918c26a73dd18a3dad45375d851139c855a
tree57f8dd75a95428872423e34c0a3f7c9908ab45e7
parent2d620b89d3ff7b151f9ae57f988689dd18bf4eca
parent2c4eb8bd98d64fe519b64448075e53b00c118ab2
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'

Conflicts:
arch/powerpc/include/asm/Kbuild
arch/powerpc/include/asm/kvm_para.h
arch/powerpc/kvm/44x_emulate.c
Documentation/virtual/kvm/api.txt