diff options
| author | Kevin Hilman <khilman@baylibre.com> | 2016-04-14 14:51:51 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@baylibre.com> | 2016-04-14 14:51:51 -0700 |
| commit | 2193a3fd7bc6ffd607c1a791d05d22a4a2282c57 (patch) | |
| tree | 5adc142c76147384d1f4035ce538bf49e2425e37 | |
| parent | 0b24f7a8d6e0d17bcf24433ce5827841a05b5b46 (diff) | |
| parent | d9c9f3b809d2bb0356f013e88d10730eafab5346 (diff) | |
Merge tag 'v4.6-soc-fixes' of https://github.com/mbgg/linux-mediatek into fixes
- fix boot error reverting commit cc8ed76938b5
("soc: mediatek: SCPSYS: Fix double enabling of regulators")
* tag 'v4.6-soc-fixes' of https://github.com/mbgg/linux-mediatek:
Revert "soc: mediatek: SCPSYS: Fix double enabling of regulators"