projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e3cef9b 0244062)
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)
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

1  2 
Documentation/devicetree/bindings/vendor-prefixes.txt patch | diff1 | diff2 | blob | history
arch/arm/boot/dts/Makefile patch | diff1 | diff2 | blob | history

diff --cc arch/arm/boot/dts/Makefile
Simple merge
Domain: System / Kernel;