]> 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>
Thu, 8 Nov 2012 03:03:50 +0000 (14:03 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 8 Nov 2012 03:03:50 +0000 (14:03 +1100)
commit432ca840c47ac66083946d43817df611139dd8f9
treeb842b180c68f775241d2f235ff6723a6291a072a
parent9dcdd2630bfbe7238abba60e52e419ff50078684
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