Merge tag 'aspeed-for-4.7-dts' of https://github.com/shenki/linux into next/dt
authorArnd Bergmann <arnd@arndb.de>
Tue, 10 May 2016 14:08:21 +0000 (16:08 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 10 May 2016 14:08:21 +0000 (16:08 +0200)
commit18aab73fba7abee4df472424d115d76b199877cb
tree036c1a5d59e8167e5791b83d8e7eaad942622f67
parente3cef9bbb5a2b3c7dd0e11fe2e6e38574e5061c0
parent02440622656d26a0d68308db9e4ce1d2510f6530
Merge tag 'aspeed-for-4.7-dts' of https://github.com/shenki/linux into next/dt

Merge "aspeed devicetree for 4.7" from Joel Stanley:

This device trees for a pair of Aspeed BMC SoCs and the boards that
they sit in.

* tag 'aspeed-for-4.7-dts' of https://github.com/shenki/linux:
  arm/dst: Add Aspeed ast2500 device tree
  arm/dts: Add Aspeed ast2400 device tree
  doc/devicetree: Add Aspeed and Tyan to vendor-prefixes
Documentation/devicetree/bindings/vendor-prefixes.txt
arch/arm/boot/dts/Makefile