Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux...

Freescale updates from Scott:

"Highlights include 8xx hugepage support, qbman fixes/cleanup, device
tree updates, and some misc cleanup."

diff --cc arch/powerpc/include/asm/book3s/32/pgtable.h
Simple merge

diff --cc arch/powerpc/include/asm/book3s/64/pgtable.h
Simple merge

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

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

diff --cc arch/powerpc/include/asm/nohash/32/pgtable.h
Simple merge

diff --cc arch/powerpc/include/asm/nohash/64/pgtable.h
Simple merge

diff --cc arch/powerpc/mm/Makefile
Simple merge