]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Nov 2012 02:42:16 +0000 (13:42 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Nov 2012 02:42:16 +0000 (13:42 +1100)
commite442c814d34451383c370bc336778fd8a2f7a849
tree3db151f9c4361b6e50d9dcb2547e7a057a5a35ad
parentacd3fd96e17b468ae58874048c5ad70cf09e719b
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/uapi/asm/epapr_hcalls.h