Merge branch 'fixes' into next

There's a non-trivial dependency between some commits we want to put in
next and the KVM prefetch work around that went into fixes. So merge
fixes into next.

diff --cc arch/powerpc/Makefile
Simple merge

diff --cc arch/powerpc/boot/Makefile
Simple merge

diff --cc arch/powerpc/include/asm/book3s/64/mmu.h
Simple merge

diff --cc arch/powerpc/include/asm/book3s/64/pgtable.h
Simple merge

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

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

diff --cc arch/powerpc/kernel/idle_book3s.S
Simple merge

diff --cc arch/powerpc/kernel/irq.c
Simple merge

diff --cc arch/powerpc/kernel/process.c
Simple merge

diff --cc arch/powerpc/kernel/watchdog.c
Simple merge

diff --cc arch/powerpc/mm/mmu_context_book3s64.c
Simple merge

diff --cc arch/powerpc/mm/pgtable-radix.c
Simple merge

diff --cc arch/powerpc/mm/tlb-radix.c
Simple merge

diff --cc arch/powerpc/platforms/powernv/idle.c
Simple merge

diff --cc arch/powerpc/platforms/powernv/pci-ioda.c
Simple merge

diff --cc arch/powerpc/platforms/pseries/reconfig.c
Simple merge