Merge tag 'powerpc-4.7-5' into next
authorMichael Ellerman <mpe@ellerman.id.au>
Fri, 15 Jul 2016 04:57:47 +0000 (14:57 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Fri, 15 Jul 2016 04:57:47 +0000 (14:57 +1000)
Pull in the fixes we sent during 4.7, we have code we want to merge into
next that depends on some of them.

1  2 
arch/powerpc/include/asm/book3s/64/mmu-hash.h
arch/powerpc/kernel/eeh_driver.c
arch/powerpc/kernel/pci_64.c
arch/powerpc/kernel/process.c
arch/powerpc/mm/hash_native_64.c
arch/powerpc/mm/hash_utils_64.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge