]> 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>
Tue, 13 Nov 2012 02:58:31 +0000 (13:58 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Nov 2012 02:58:31 +0000 (13:58 +1100)
commit3393796062e06c3bd4c74931f96fe40a2d11eb5e
tree9ad54f3ff2852ec26666c8631be896602b14b565
parent202787ddb40887213b3683aa10e03543e5fecd07
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