diff options
author | Lee Jones <lee.jones@linaro.org> | 2017-02-13 10:29:15 +0100 |
---|---|---|
committer | Lee Jones <lee.jones@linaro.org> | 2017-02-13 10:29:15 +0100 |
commit | 128818f126bc2b9aa5cbcc1ac0429a20876d911b (patch) | |
tree | bd78f92e46adfd635bbf1084e768e90faa55a800 /drivers/mfd | |
parent | iio: Add STM32 timer trigger driver (diff) | |
parent | input: cros_ec_keyb: Add Tablet Mode switch (diff) | |
parent | mfd: lpc_ich: Add support for Intel Apollo Lake SoC (diff) | |
parent | power: supply: axp288_fuel_gauge: Drop platform_data dependency (diff) | |
download | linux-128818f126bc2b9aa5cbcc1ac0429a20876d911b.tar.xz linux-128818f126bc2b9aa5cbcc1ac0429a20876d911b.zip |
Merge branches 'ib-mfd-arm-iio-pwm-4.11', 'ib-mfd-input-4.11-1', 'ib-mfd-mtd-4.11' and 'ib-mfd-power-supply-4.11' into ibs-for-mfd-merged