From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 7 Feb 2017 14:58:08 +0000 (+0100)
Subject: Merge tag 'socfpga_dts_for_v4.11_part_2' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.11-rc1~87^2~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fd896f5acd037c782f3bac8dedfb0d7e580d0b22;p=platform%2Fkernel%2Flinux-exynos.git

Merge tag 'socfpga_dts_for_v4.11_part_2' of git://git./linux/kernel/git/dinguyen/linux into next/dt

Pull "SoCFPGA DTS updates for v4.11, part 2" from Dinh Nguyen:

- Add AXI configuration for DWMAC ethernet controllers on Arria10
- Use watchdog1 instead of watchdog0 on Arria10

* tag 'socfpga_dts_for_v4.11_part_2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  ARM: dts: Add EMAC AXI settings for Arria10
  ARM: dts: watchdog0 cannot reliably trigger reset
---

fd896f5acd037c782f3bac8dedfb0d7e580d0b22