From: Olof Johansson Date: Wed, 19 Apr 2017 13:43:54 +0000 (-0700) Subject: Merge tag 'mvebu-dt-4.12-2' of git://git.infradead.org/linux-mvebu into next/dt X-Git-Tag: MMI-PSA29.97-13-9~5641^2~16 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=107193765b3ee737a272da41967f33abaf487046;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge tag 'mvebu-dt-4.12-2' of git://git.infradead.org/linux-mvebu into next/dt mvebu dt for 4.12 (part 2) Use disk-activity trigger for armada-385-linksys Keep dts alphabetically ordered for clearfog (Armada 388) * tag 'mvebu-dt-4.12-2' of git://git.infradead.org/linux-mvebu: ARM: dts: armada-385-linksys: disk-activity trigger for all ARM: dts: clearfog: keep dts alphabetically ordered Signed-off-by: Olof Johansson --- 107193765b3ee737a272da41967f33abaf487046