Merge branch 'fixes' into next

Merge our fixes branch to bring in some changes that conflict with
upcoming next content.

diff --cc arch/powerpc/Kconfig
Simple merge

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

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

diff --cc arch/powerpc/mm/book3s64/hash_utils.c
Simple merge