Merge tag 'v4.6-soc-fixes' of https://github.com/mbgg/linux-mediatek into fixes
authorKevin Hilman <khilman@baylibre.com>
Thu, 14 Apr 2016 21:51:51 +0000 (14:51 -0700)
committerKevin Hilman <khilman@baylibre.com>
Thu, 14 Apr 2016 21:51:51 +0000 (14:51 -0700)
- 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"


Trivial merge