Merge branch 'next' of https://git.kernel.org/pub/scm/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."