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)
commit4afa0f3a89ca4b60066a5278c2e13dd29118d672
tree9b417cf722970e7a669c662c2aade849c7adab62
parentebf0b6a8b1e445d2be66087732aafcda12ab9f59
parentc095ff93f901c1620b28dce4d813dd548bc5236b
Merge branch 'next' of https://git./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."