aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-02-03 12:39:46 +0100
committerMark Brown <broonie@kernel.org>2017-02-03 12:39:46 +0100
commit206c4720092d2a24bfefc041b377e889a220ffbf (patch)
tree2360fff83a9313d5c1d8c611cbcf7a55ecd5276d
parentd0e287a401d9acf67b75180b26e2d62b7d482652 (diff)
parent1372cef1c697d8aac0cc923f8aa2c37d790ec9ed (diff)
parentb98acbff9a05b371c5f0ca6e44a3af8ce9274379 (diff)
downloadlinux-stericsson-206c4720092d2a24bfefc041b377e889a220ffbf.tar.gz
Merge remote-tracking branches 'regulator/fix/fixed' and 'regulator/fix/twl6040' into regulator-linus