OSDN Git Service

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)
Updates from Scott:
  "This contains a couple device tree updates, and a fix for a missing
   prototype warning."

1  2 
arch/powerpc/mm/8xx_mmu.c

Simple merge