Merge tag 'mvebu-soc-4.14-1' of git://git.infradead.org/linux-mvebu into next/soc
authorArnd Bergmann <arnd@arndb.de>
Wed, 16 Aug 2017 20:40:18 +0000 (22:40 +0200)
committerArnd Bergmann <arnd@arndb.de>
Wed, 16 Aug 2017 20:40:18 +0000 (22:40 +0200)
Pull "mvebu soc for 4.14 (part 1)" from Gregory CLEMENT:

Enabling ARM_GLOBAL_TIMER in mvebu_v7_defconfig for Armada 38x

* tag 'mvebu-soc-4.14-1' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: enable ARM_GLOBAL_TIMER compilation Armada 38x platforms


Trivial merge