Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git
authorMichael Ellerman <mpe@ellerman.id.au>
Fri, 3 Oct 2014 22:59:06 +0000 (08:59 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Fri, 3 Oct 2014 22:59:06 +0000 (08:59 +1000)
commit75d43b2d0a323ba894d85060888f039e41b441ca
tree2f49ace1f85510e8b21974e6dd45dfcc2a87666a
parentd0b7abb2c7c05552aca2a0358c53b6a48eab2843
parentcb0446c1b625326682ec4f9d1dd10779433646bc
Merge branch 'next' of git://git./linux/kernel/git/scottwood/linux.git

Freescale updates from Scott (27 commits):

  "Highlights include DMA32 zone support (SATA, USB, etc now works on 64-bit
   FSL kernels), MSI changes, 8xx optimizations and cleanup, t104x board
   support, and PrPMC PCI enumeration."
arch/powerpc/Kconfig
arch/powerpc/configs/corenet64_smp_defconfig
arch/powerpc/include/asm/reg.h
arch/powerpc/kernel/dma.c
arch/powerpc/mm/mem.c
arch/powerpc/mm/numa.c