From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 12 Mar 2018 14:29:57 +0000 (+0100)
Subject: Merge tag 'imx-fixes-4.16-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.19~1380^2~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=314700625873d0aec520a739861ea91d8ebbe986;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'imx-fixes-4.16-2' of ssh://gitolite./linux/kernel/git/shawnguo/linux into fixes

Pull "i.MX fixes for 4.16, 2nd round" from Shawn Guo:

 - Fix a copy-paste error in imx7d-sdb device tree, which results in two
   usb-otg regulators are both named "regulator-usb-otg1-vbus" and
   override each other.

* tag 'imx-fixes-4.16-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: dts: imx7d-sdb: Fix regulator-usb-otg2-vbus node name
---

314700625873d0aec520a739861ea91d8ebbe986