From: Michael Ellerman <mpe@ellerman.id.au>
Date: Mon, 29 Oct 2018 11:31:51 +0000 (+1100)
Subject: Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/scottwood... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3b9672fff747b31a2204003cab9fe082321edc1b;p=openwrt%2Fstaging%2Fblogic.git

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."
---

3b9672fff747b31a2204003cab9fe082321edc1b