From: Michael Ellerman <mpe@ellerman.id.au>
Date: Mon, 2 Nov 2015 02:59:48 +0000 (+1100)
Subject: Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux... 
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=3b0e21ec3b22ab5eced5331eaf55949006f22687;p=deliverable%2Flinux.git

Merge branch 'next' of git://git./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."
---

3b0e21ec3b22ab5eced5331eaf55949006f22687