Merge tag 'mvebu-dt-4.12-2' of git://git.infradead.org/linux-mvebu into next/dt
authorOlof Johansson <olof@lixom.net>
Wed, 19 Apr 2017 13:43:54 +0000 (06:43 -0700)
committerOlof Johansson <olof@lixom.net>
Wed, 19 Apr 2017 13:43:54 +0000 (06:43 -0700)
commit107193765b3ee737a272da41967f33abaf487046
tree83d9d54aefff7256c030f7f96b03605cb24ed008
parenta51ed6cfb223ec5e7ab2c2c6e6bf50490b7e6323
parent34240c26d1d7b4365d4d0a8d231b244eb396c8dc
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 <olof@lixom.net>