]> 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>
Wed, 31 Oct 2012 04:05:01 +0000 (15:05 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 31 Oct 2012 04:05:01 +0000 (15:05 +1100)
commit51bd35df0187f219cf2bc2808c61e0049a30dafa
tree3e2c29e11863c19b9200cbd05af4ed5fdc9966f1
parenta3d9372ac01f75183f5bbd602e2f250be6a8947b
parentf534a5357b02eb59e298da3ffe014aac5c0d198b
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'

Conflicts:
arch/powerpc/include/asm/Kbuild
arch/powerpc/include/uapi/asm/Kbuild
arch/powerpc/include/asm/smp.h
arch/powerpc/kernel/smp.c
arch/powerpc/kvm/book3s_hv.c
arch/powerpc/kvm/book3s_hv_rmhandlers.S