]> 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, 7 Nov 2012 02:21:35 +0000 (13:21 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 Nov 2012 02:21:35 +0000 (13:21 +1100)
commitcdd23a3828c797837fbccdd1d13f545763178461
treedf7a3903aefb428e691bbad8ccee668296d27fab
parent86493a037fe5fd302058f460e39b0c9cbfc71e70
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