Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux...
authorMichael Ellerman <mpe@ellerman.id.au>
Tue, 11 Oct 2016 09:07:56 +0000 (20:07 +1100)
committerMichael Ellerman <mpe@ellerman.id.au>
Tue, 11 Oct 2016 09:07:56 +0000 (20:07 +1100)
commit065397a969a0f80624598c5030c2551abbd986fd
tree60a4c453e6b494c8b3973497c577efa2f10102e4
parent8321564a11bbeadffcc7d6335bcf3c07e5c397a3
parente0b80f00bb96b925995d53980e0c764430bedb42
Merge branch 'next' of git://git./linux/kernel/git/scottwood/linux into next

Freescale updates from Scott:

"Highlights include qbman support (a prerequisite for datapath drivers
such as ethernet), a PCI DMA fix+improvement, reset handler changes, more
8xx optimizations, and some cleanups and fixes."
arch/powerpc/include/asm/ppc-opcode.h
arch/powerpc/include/asm/reg.h
arch/powerpc/kernel/traps.c