]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge commit 'refs/next/20121012/kvm-ppc'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 15 Oct 2012 00:34:31 +0000 (11:34 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 15 Oct 2012 00:34:31 +0000 (11:34 +1100)
commitf7b1ff9deead5acf79642516e67a245e500a337d
tree26f827999d5bdec76a005d259ab13580587686d3
parenta767cbf604f4231e1f4f8d0b576f693c4bd0ad25
parent2c4eb8bd98d64fe519b64448075e53b00c118ab2
Merge commit 'refs/next/20121012/kvm-ppc'

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