Merge tag 'powerpc-4.5-4' into next

Pull in our current fixes from 4.5, in particular the "Fix Multi hit
ERAT" bug is causing folks some grief when testing next.

diff --cc arch/powerpc/Kconfig
Simple merge

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

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

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

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

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

diff --cc mm/huge_memory.c
Simple merge