projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: dbe8a9d 970656b)
Merge tag 'imx-fixes-4.16-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Mon, 12 Mar 2018 14:29:57 +0000 (15:29 +0100)
committerArnd Bergmann <arnd@arndb.de>
Mon, 12 Mar 2018 14:29:57 +0000 (15:29 +0100)
commit314700625873d0aec520a739861ea91d8ebbe986
treea2e37c539b4a7d1d3b155e1bfeec727d95eed3actree | snapshot
parentdbe8a9dfd7eafe2832f80e6e29e5b1575576c987commit | diff
parent970656b3246d30955894951ed16bd658e42d8c24commit | diff
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
John Crispins staging tree