projects / platform / kernel / linux-exynos.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5f2f35a cda1ade)
Merge tag 'socfpga_dts_for_v4.11_part_2' of git://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Tue, 7 Feb 2017 14:58:08 +0000 (15:58 +0100)
committerArnd Bergmann <arnd@arndb.de>
Tue, 7 Feb 2017 14:58:08 +0000 (15:58 +0100)
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


Trivial merge
Domain: System / Kernel;