Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/scottwood...
authorMichael Ellerman <mpe@ellerman.id.au>
Mon, 13 Aug 2018 06:06:23 +0000 (16:06 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Mon, 13 Aug 2018 06:06:23 +0000 (16:06 +1000)
Merge some updates from Scott:

"This contains an 8xx compilation fix, and a dpaa device tree fix."


Trivial merge