diff options
| author | Lee Jones <lee.jones@linaro.org> | 2016-03-09 12:56:47 +0700 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2016-03-09 12:56:47 +0700 |
| commit | bab070620ebe130ec5296817caf074f5f5211d71 (patch) | |
| tree | 46e0155812b0e21bcd7ea6c63f216c5799e82815 /drivers/mfd/Makefile | |
| parent | c4726abce63bf9b1887ce68fdf012a823bd94ec3 (diff) | |
| parent | 0708677558dd7d03e70292549433f0f6b04a5e00 (diff) | |
| parent | 04e0981c67e6a7ba8aacac731d925f4ff21b67fb (diff) | |
| parent | ca801a22f465eae39fadc770e15b5b7e82595f81 (diff) | |
Merge branches 'ib-mfd-clk-4.6', 'ib-mfd-input-iio-4.6', 'ib-mfd-regulator-4.6' and 'ib-mfd-regulator-gpio-4.6' into ibs-for-mfd-merged