summaryrefslogtreecommitdiff
path: root/drivers/regulator/s2mps11.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-01-23 12:01:31 +0000
committerMark Brown <broonie@linaro.org>2014-01-23 12:01:31 +0000
commit07b19808486054f356dbf3495a277f51af062b35 (patch)
treea9a3918ad1f87da0f7551a27c565dceab9e9840d /drivers/regulator/s2mps11.c
parenta2a2be6309285857bfbc66f83e164331828e93c2 (diff)
parent699b36973df9d70231c48302b1bafe06be52a0c7 (diff)
parentee5182b59f65e7975d8fec73d511f4d6c44f6ed3 (diff)
parent991a645d6b3320c07b8d78c58f8911f0b197e5d5 (diff)
parent9d9339d3a6fae737efe0e0be2f3cad6533d58bcf (diff)
parent541f597f1080ee615534cb6ccb2253891a29535c (diff)
parentb8903eb9836e4e968d1bf9758b501de2c38cfb83 (diff)
parent3db398859312eed52354f73fcddbab80d9fae57c (diff)
parent477b2bacb1bc30c62e390dbb8fda08bdef274d82 (diff)
Merge remote-tracking branches 'regulator/topic/s2mps11', 'regulator/topic/s5m8767', 'regulator/topic/stw481x-vmmc', 'regulator/topic/tps51632', 'regulator/topic/tps62360', 'regulator/topic/tps65910', 'regulator/topic/twl' and 'regulator/topic/wm831x' into regulator-linus