diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-05-29 12:54:13 (GMT) |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-05-29 12:54:13 (GMT) |
| commit | 7f05a7612e299c0aef8156e70a546ba7e5d5f947 (patch) | |
| tree | fcc06a9c6f22877929e706f41b0b1ee2aa6e5d04 /fs/Makefile | |
| parent | 0fcbffc4bdc262bd9d5802dc61fb0dcf54102f4e (diff) | |
| parent | 2a910d139e405f1038c0f2ea7f9ac45acc84cce9 (diff) | |
| download | linux-7f05a7612e299c0aef8156e70a546ba7e5d5f947.tar.xz | |
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
Diffstat (limited to 'fs/Makefile')
0 files changed, 0 insertions, 0 deletions