| commit | 314700625873d0aec520a739861ea91d8ebbe986 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Mon Mar 12 15:29:57 2018 +0100 |
| committer | Arnd Bergmann <arnd@arndb.de> | Mon Mar 12 15:29:57 2018 +0100 |
| tree | a2e37c539b4a7d1d3b155e1bfeec727d95eed3ac | |
| parent | dbe8a9dfd7eafe2832f80e6e29e5b1575576c987 [diff] | |
| parent | 970656b3246d30955894951ed16bd658e42d8c24 [diff] |
Merge tag 'imx-fixes-4.16-2' of ssh://gitolite.kernel.org/pub/scm/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