Merge tag 'v4.1-next-soc' of https://github.com/mbgg/linux-mediatek into next/drivers
authorArnd Bergmann <arnd@arndb.de>
Fri, 29 May 2015 12:54:13 +0000 (14:54 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 29 May 2015 12:54:13 +0000 (14:54 +0200)
commit7f05a7612e299c0aef8156e70a546ba7e5d5f947
treefcc06a9c6f22877929e706f41b0b1ee2aa6e5d04
parent0fcbffc4bdc262bd9d5802dc61fb0dcf54102f4e
parent2a910d139e405f1038c0f2ea7f9ac45acc84cce9
Merge tag 'v4.1-next-soc' of https://github.com/mbgg/linux-mediatek into next/drivers

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

- pmic wrapper: fix clock handling
- pmic wrapper: fix state machine
- pmic wrapper: fix compile dependency

* tag 'v4.1-next-soc' of https://github.com/mbgg/linux-mediatek:
  soc: mediatek: Add compile dependency to pmic-wrapper
  soc: mediatek: PMIC wrap: Fix register state machine handling
  soc: mediatek: PMIC wrap: Fix clock rate handling