]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
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)
commitcf828ecc706463022b08ef1b87cda25d7d567199
treee50be7b58a3932bac0f2f939a03b7179fe707cd8
parent92a2a8cbc141d99192ef3008062bf7ef3951cbb0
parent0f015017a95c279a050ed953284451d2a0d29fb2
Merge tag 'mvebu-dt-4.14-1' of git://git.infradead.org/linux-mvebu into next/dt

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
arch/arm/boot/dts/armada-388-gp.dts