]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'topic/ppc-kvm' into next
authorMichael Ellerman <mpe@ellerman.id.au>
Fri, 23 Mar 2018 21:43:18 +0000 (08:43 +1100)
committerMichael Ellerman <mpe@ellerman.id.au>
Fri, 23 Mar 2018 21:43:18 +0000 (08:43 +1100)
commitddca7ba6ad660323811060a9ffe77eec2890e488
tree1d2061bbf8ac521bb9839075beb4263752bebb23
parente22d251ac3781f417be0d367fa4ed67ef39436c3
parentb87d16cd62fe072ba857effb31ca2e53bbf37955
Merge branch 'topic/ppc-kvm' into next

This brings in two series from Paul, one of which touches KVM code and
may need to be merged into the kvm-ppc tree to resolve conflicts.
arch/powerpc/include/asm/asm-prototypes.h
arch/powerpc/include/asm/paca.h
arch/powerpc/include/asm/ppc-opcode.h
arch/powerpc/include/asm/time.h
arch/powerpc/kernel/exceptions-64s.S
arch/powerpc/kvm/powerpc.c