Merge tag 'powerpc-4.5-4' into next
commit2527083cb831024d22a03f68f54f6a46ecf5bf6c
authorMichael Ellerman <mpe@ellerman.id.au>
Thu, 25 Feb 2016 10:52:58 +0000 (25 21:52 +1100)
committerMichael Ellerman <mpe@ellerman.id.au>
Thu, 25 Feb 2016 10:52:58 +0000 (25 21:52 +1100)
tree41de92d988a4deccb2d5087a964a51682f155e99
parenta4c3f909b4d9bb9430bf42ad583661df6dfa86c6
parent9ab3ac233a8b4ffcc27c8475b83dee49fc46bc76
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.
arch/powerpc/Kconfig
arch/powerpc/kernel/eeh_driver.c
arch/powerpc/platforms/powernv/eeh-powernv.c
arch/powerpc/platforms/powernv/pci-ioda.c
arch/powerpc/platforms/powernv/pci.c
arch/powerpc/platforms/powernv/pci.h
mm/huge_memory.c