Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/scottwood...
authorMichael Ellerman <mpe@ellerman.id.au>
Mon, 29 Oct 2018 11:31:51 +0000 (22:31 +1100)
committerMichael Ellerman <mpe@ellerman.id.au>
Mon, 29 Oct 2018 11:32:52 +0000 (22:32 +1100)
commit3b9672fff747b31a2204003cab9fe082321edc1b
tree392ca7c68d28e375342c799162789b43cfcfc503
parente901378578c62202594cba0f6c076f3df365ec91
parentb6ae3550c8e2ca8f7ce1b7f04585dc12a0eb5cbd
Merge branch 'next' of https://git./linux/kernel/git/scottwood/linux into next

Updates from Scott:
  "This contains a couple device tree updates, and a fix for a missing
   prototype warning."
arch/powerpc/mm/8xx_mmu.c