From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 16 Aug 2017 21:46:59 +0000 (+0200)
Subject: Merge tag 'uniphier-dt64-v4.14' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=029fb7c2e3067211ff00fcd28652c453f6578f95;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'uniphier-dt64-v4.14' of git://git./linux/kernel/git/masahiroy/linux-uniphier into next/dt64

Pull "UniPhier ARM64 SoC DT updates for v4.14" from Masahiro Yamada:

- add nodes for NAND, Watchdog
- replace /include/ with #include
- use #include <arm/...> instead of symlinks

* tag 'uniphier-dt64-v4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier:
  arm64: dts: uniphier: add Denali NAND controller nodes
  arm64: dts: uniphier: use cross-arch include instead of symlinks
  arm64: dts: uniphier: use #include instead of /include/
  arm64: dts: uniphier: add watchdog node for LD11 and LD20
---

029fb7c2e3067211ff00fcd28652c453f6578f95