]> 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>
Mon, 12 Nov 2012 02:22:27 +0000 (13:22 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Nov 2012 02:22:27 +0000 (13:22 +1100)
commit69ab41cb9da090fbdaab11e0cd58e78ebe48c1b0
tree2b7ee8f469de9c67a20b21dbc84e505ebe509bc0
parent61d76c104e341414848342a3a9a2540489b8c66e
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