projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitfd896f5acd037c782f3bac8dedfb0d7e580d0b22
tree2b8ba73fc9c303850cfe8c3155436ab647dc5419tree | snapshot (tar.gz zip)
parent5f2f35a1ffb75669dfed0b2af9814d2ad36a285ecommit | diff
parentcda1ade6a25c85d0a7cc2001a96b0b20f6bfd3f0commit | diff
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