diff options
| author | Lee Jones <lee.jones@linaro.org> | 2014-07-09 14:55:13 +0100 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2014-07-09 14:55:13 +0100 |
| commit | 6ec9dc323b0fd4b83e6da64acc871f74508c0077 (patch) | |
| tree | 0f2ca300f22c35916d741ca397a3f25f3d26aeab /drivers/mfd/Makefile | |
| parent | 342d669c1ee421323f552a62729d3a3d0065093c (diff) | |
| parent | 8dbf2aa3c308ade864261e8047b0dce1f4ed9a7e (diff) | |
| parent | 6291e7153a173f85bbdb13bf0c72fa11b5d74bc0 (diff) | |
Merge branches 'ib-mfd-extcon-regulator-3.17', 'ib-mfd-gpio-3.17' and 'ib-mfd-mmc-3.17' into ibs-for-mfd-merged