tree 577e786f5d81fb973e8cfaf91da19bff8b5ad45a
parent ccde64b51b33821159d52b0940fb21869bfdb316
parent e1f580e8ced56d7c0a2b096e00e8b8e861d13671
author Michael Ellerman <mpe@ellerman.id.au> 1446433188 +1100
committer Michael Ellerman <mpe@ellerman.id.au> 1446433188 +1100

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

Freescale updates from Scott:

"Highlights include 64-bit book3e kexec/kdump support, a rework of the
qoriq clock driver, device tree changes including qoriq fman nodes,
support for a new 85xx board, and some fixes.

Note that there is a trivial merge conflict with the clock tree's next
branch, in the clock Makefile."