]> www.infradead.org Git - users/hch/dma-mapping.git/commitdiff
projects / users / hch / dma-mapping.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 92a2a8c 0f01501)
Merge tag 'mvebu-dt-4.14-1' of git://git.infradead.org/linux-mvebu into next/dt
authorArnd Bergmann <arnd@arndb.de>
Wed, 16 Aug 2017 21:22:41 +0000 (23:22 +0200)
committerArnd Bergmann <arnd@arndb.de>
Wed, 16 Aug 2017 21:22:41 +0000 (23:22 +0200)
Pull "mvebu dt for 4.14 (part 1)" from Gregory CLEMENT:

Add arm_global_timer node on Armada 38x

Fix PCI bus dtc warnings on mvebu 32 bits device tree files

* tag 'mvebu-dt-4.14-1' of git://git.infradead.org/linux-mvebu:
  ARM: dts: armada-38x: Add arm_global_timer node
  ARM: dts: marvell: fix PCI bus dtc warnings

1  2 
arch/arm/boot/dts/armada-388-gp.dts patch | diff1 | diff2 | blob | history

diff --cc arch/arm/boot/dts/armada-388-gp.dts
Simple merge
Unnamed repository; edit this file 'description' to name the repository.