summaryrefslogtreecommitdiff
path: root/drivers/mfd/axp20x.c
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2014-11-25 16:18:03 +0000
committerLee Jones <lee.jones@linaro.org>2014-11-25 16:18:03 +0000
commita9e2e4733cb6457aa6cbae4489b68ff0684848af (patch)
treea12504cd94e1d0a48591bf2072b862cce799fb2f /drivers/mfd/axp20x.c
parentf114040e3ea6e07372334ade75d1ee0775c355e1 (diff)
parent2fc2b4846c14c8c2d2c6e9114b4548f846521cfb (diff)
parent8019f6962708985782b65bd97be88046a55e1e4d (diff)
parenta4b4e0461ec5532ad498f0dd0e68993ad79bec2b (diff)
parent159a5e920446aed12fe373ecc3c7b3dc667091ae (diff)
Merge branches 'ib-mfd-gpio-i2c-3.19', 'ib-mfd-iio-3.19' and 'ib-mfd-regulator-v3.19', tag 'ib-mfd-regulator-clk-v3.19' into ibs-for-mfd-merged
Immutable branch between MFD, Regulator and Clk, due for v3.19