diff options
author | Arnd Bergmann <arnd@arndb.de> | 2015-03-11 15:38:11 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2015-03-11 15:38:11 +0100 |
commit | b85b634ebec086bf539116526cddd287229d6abf (patch) | |
tree | 5638e5341b392e0159983944f2e5aad9f9946557 /scripts | |
parent | 01f3e35f2b1db307b718b1029794b005a0d2eb26 (diff) | |
parent | 2de9dd0391a74e80922c1bc95a78cedf85bcdc9e (diff) |
Merge tag 'imx-fixes-4.0' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes
Pull "The i.MX fixes for 4.0" from Shawn Guo:
It includes a couple of i.MX6 dts fixes, which set an input supply to
vbus regulator. Without the fixes, the voltage of vbus is incorrect
after system boots up.
* tag 'imx-fixes-4.0' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: imx6sl-evk: set swbst_reg as vbus's parent reg
ARM: imx6qdl-sabresd: set swbst_reg as vbus's parent reg
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions