Merge tag 'aspeed-4.14-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Thu, 24 Aug 2017 11:10:12 +0000 (13:10 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 24 Aug 2017 11:10:12 +0000 (13:10 +0200)
commit7bf53b96bdccc002fa8adb3ae8d49ee3189a323b
tree8b026615a682891944468c35d890ada16d2586fc
parentcea92099c99a186624be6df9701fcec813ebf441
parentbcbd328d3fe765f333642b7cfe384d59dffc2db2
Merge tag 'aspeed-4.14-devicetree' of git://git./linux/kernel/git/joel/aspeed into next/dt

Pull "Aspeed devicetree updates for 4.14" from Joel Stanley:

 - fix to expose the full flash windows on ast2400.

* tag 'aspeed-4.14-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed:
  ARM: dts: aspeed-g4: fix AHB window size of the SMC controllers