From: Kevin Hilman <khilman@linaro.org>
Date: Wed, 1 Jul 2015 19:53:49 +0000 (-0700)
Subject: Merge tag 'mvebu-dt-4.2-3' of git://git.infradead.org/linux-mvebu into next/late
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b72802c3117417ab696b0764d6e3cea369f578a6;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge tag 'mvebu-dt-4.2-3' of git://git.infradead.org/linux-mvebu into next/late

Merge "ARM: mvebu: dt changes for v4.2" from Gregory Clement

mvebu dt changes for v4.2 (part #3)

Update Armada XP DT spi muxing after pinctrl function rename which was
merged in the pinctrl subsystem for 4.2. Without it the spi muxing
will be broken in 4.2-rc1 for Armada XP.

* tag 'mvebu-dt-4.2-3' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: adjust Armada XP DT spi muxing after pinctrl function rename
---

b72802c3117417ab696b0764d6e3cea369f578a6