Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/scottwood...
authorMichael Ellerman <mpe@ellerman.id.au>
Sun, 21 Jan 2018 12:32:02 +0000 (23:32 +1100)
committerMichael Ellerman <mpe@ellerman.id.au>
Sun, 21 Jan 2018 12:32:02 +0000 (23:32 +1100)
Freescale updates from Scott:

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


Trivial merge