Merge tag 'mvebu-fixes-4.10-1' of git://git.infradead.org/linux-mvebu into fixes
authorArnd Bergmann <arnd@arndb.de>
Mon, 6 Feb 2017 16:33:51 +0000 (17:33 +0100)
committerArnd Bergmann <arnd@arndb.de>
Mon, 6 Feb 2017 16:33:51 +0000 (17:33 +0100)
commita47b3fca62a34e5956fc9b61065083e9c055d50f
tree73ba5f3f97ba0b5dfaf9ade99cd72f5e86e5fb26
parent08b3b33f3e4dc0016ad878c1a48f094a74956277
parent1a902f6b70c55171ca2419d946b85274e35c9757
Merge tag 'mvebu-fixes-4.10-1' of git://git.infradead.org/linux-mvebu into fixes

Pull "mvebu fixes for 4.10 (part 1)" from Gregory CLEMENT:

More consistent naming for some orion5x based boards helping the
switch to device tree for debian users.

* tag 'mvebu-fixes-4.10-1' of git://git.infradead.org/linux-mvebu:
  ARM: orion5x: fix Makefile for linkstation-lschl.dtb
  ARM: dts: orion5x-lschl: More consistent naming on linkstation series
  ARM: dts: orion5x-lschl: Fix model name
arch/arm/boot/dts/Makefile