Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/scottwood...
authorMichael Ellerman <mpe@ellerman.id.au>
Mon, 13 Aug 2018 06:06:23 +0000 (16:06 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Mon, 13 Aug 2018 06:06:23 +0000 (16:06 +1000)
commit241b5f7ffcbe6b93304c6a282e5a339e22dac5b4
treef5bb8e205d5cf11dc1804912a2d52fa743391d54
parent70b5c4ee8e3bf7ce107d6926d9c7d8ebb68578c2
parentbd96461249bdded1f6ee50b25e8cd4ce3faaf581
Merge branch 'next' of https://git./linux/kernel/git/scottwood/linux into next

Merge some updates from Scott:

"This contains an 8xx compilation fix, and a dpaa device tree fix."