From: Michael Ellerman <mpe@ellerman.id.au>
Date: Sun, 21 Jan 2018 12:32:02 +0000 (+1100)
Subject: Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/scottwood... 
X-Git-Tag: v4.16-rc1~93^2~54
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=4afa0f3a89ca4b60066a5278c2e13dd29118d672;p=linux.git

Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next

Freescale updates from Scott:

"Contains fixes for CPM GPIO and an FSL PCI erratum workaround, plus a
 minor cleanup patch."
---

4afa0f3a89ca4b60066a5278c2e13dd29118d672