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.

diff --cc arch/powerpc/include/asm/asm-prototypes.h
Simple merge

diff --cc arch/powerpc/include/asm/paca.h
Simple merge

diff --cc arch/powerpc/include/asm/ppc-opcode.h
Simple merge

diff --cc arch/powerpc/include/asm/time.h
Simple merge

diff --cc arch/powerpc/kernel/exceptions-64s.S
Simple merge

diff --cc arch/powerpc/kvm/powerpc.c
Simple merge