From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 19 Oct 2017 15:36:08 +0000 (+0200)
Subject: Merge tag 'at91-fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=ca7325a2b1fb6bba48e13afe4dce070e29467cc5;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'at91-fixes2' of git://git./linux/kernel/git/nferre/linux-at91 into fixes

Fixes: second batch for 4.14:
- one DT phy address fix for the new sama5d27 som1 ek
- two DT ADC patches that were forgotten while moving to
  hardware triggers for sama5d2 (iio changes already applied)

* tag 'at91-fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
  ARM: dts: at91: sama5d2: add ADC hw trigger edge type
  ARM: dts: at91: sama5d2_xplained: enable ADTRG pin
  ARM: dts: at91: at91-sama5d27_som1: fix PHY ID
---

ca7325a2b1fb6bba48e13afe4dce070e29467cc5