9d8633915ba52158d53b016d276ca30616a6e6b3 - arm/linux

commit	9d8633915ba52158d53b016d276ca30616a6e6b3	[log] [tgz]
author	Olof Johansson <olof@lixom.net>	Fri Apr 03 14:49:52 2015 -0700
committer	Olof Johansson <olof@lixom.net>	Fri Apr 03 14:49:52 2015 -0700
tree	4e1d1e4f627563c594cd5c69e8424db94f4cb1f3
parent	47f36e4921ae11dccf3163f75f70bb55686780f1 [diff]
parent	1f022d84bd193ec88b01c6d2cb5b6647cb20a02f [diff]

Merge tag 'v4.0-next-soc' of https://github.com/mbgg/linux-mediatek into next/drivers

Merge "ARM: mediatek: soc updates for v4.1" from Matthias Brugger:

- enable the pin controller in Kconfig
- Add PMIC wrapper for MT8135 and MT8173 SoCs

* tag 'v4.0-next-soc' of https://github.com/mbgg/linux-mediatek:
  soc: mediatek: Add PMIC wrapper for MT8135 and MT8173 SoCs
  ARM: mediatek: enable the pin controller

Signed-off-by: Olof Johansson <olof@lixom.net>

tree: 4e1d1e4f627563c594cd5c69e8424db94f4cb1f3