diff options
author | Lee Jones <lee.jones@linaro.org> | 2016-03-09 06:56:47 +0100 |
---|---|---|
committer | Lee Jones <lee.jones@linaro.org> | 2016-03-09 06:56:47 +0100 |
commit | bab070620ebe130ec5296817caf074f5f5211d71 (patch) | |
tree | 46e0155812b0e21bcd7ea6c63f216c5799e82815 /drivers/mfd/Makefile | |
parent | mfd: intel_quark_i2c_gpio: Use clkdev_create() (diff) | |
parent | iio: adc/imx25-gcq: Move incorrect do_div (diff) | |
parent | regulator: axp20x: Support new AXP223 PMIC (diff) | |
parent | gpio: tps65912: Add GPIO driver for the TPS65912 PMIC (diff) | |
download | linux-bab070620ebe130ec5296817caf074f5f5211d71.tar.xz linux-bab070620ebe130ec5296817caf074f5f5211d71.zip |
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