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

Merge some updates from Scott:

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