diff options
author | Lee Jones <lee.jones@linaro.org> | 2017-02-13 09:29:15 +0000 |
---|---|---|
committer | Lee Jones <lee.jones@linaro.org> | 2017-02-13 09:29:15 +0000 |
commit | 128818f126bc2b9aa5cbcc1ac0429a20876d911b (patch) | |
tree | bd78f92e46adfd635bbf1084e768e90faa55a800 /drivers/mfd | |
parent | 93fbe91b552194af970256ce72934745d01df435 (diff) | |
parent | 6ccc3a33810e8ec09936fa990c13370d9f61606f (diff) | |
parent | 87eb832ae9748fab00588b98c2e33e89de065438 (diff) | |
parent | 888f97435a856c2c5c6ca0b3337b68d595b5639e (diff) | |
download | linux-128818f126bc2b9aa5cbcc1ac0429a20876d911b.tar.bz2 |
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