Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux...
commitc6f6634721c871bfab4235e1cbcad208d3063798
authorMichael Ellerman <mpe@ellerman.id.au>
Fri, 16 Dec 2016 04:05:38 +0000 (16 15:05 +1100)
committerMichael Ellerman <mpe@ellerman.id.au>
Fri, 16 Dec 2016 04:05:38 +0000 (16 15:05 +1100)
tree9cc1d0307b9c5a3a84021419d5f80bea8bbfc49e
parentff45000fcb56b5b0f1a14a865d3541746d838a0a
parentbaae856ebdeeaefbadd4a02cdb54b7c2277ff4dd
Merge branch 'next' of git://git./linux/kernel/git/scottwood/linux into next

Freescale updates from Scott:

"Highlights include 8xx hugepage support, qbman fixes/cleanup, device
tree updates, and some misc cleanup."
arch/powerpc/include/asm/book3s/32/pgtable.h
arch/powerpc/include/asm/book3s/64/pgtable.h
arch/powerpc/include/asm/hugetlb.h
arch/powerpc/include/asm/mmu.h
arch/powerpc/include/asm/nohash/32/pgtable.h
arch/powerpc/include/asm/nohash/64/pgtable.h
arch/powerpc/mm/Makefile