summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-04-10 23:39:38 +0100
committerMark Brown <broonie@linaro.org>2014-04-10 23:39:38 +0100
commit039df7a7cbccb4ea5527c92134b4535fb5bf9671 (patch)
treeebe200cb232c71863ecca47f0733ac7ca81edf47 /drivers
parented59c8f93d153d9215222d5a2e23644a315bce2f (diff)
parent1e7914058e3533d905618dd00a36499c8d29e7be (diff)
parentb96244fad9530a707b732c3650d349aed2c9cfcd (diff)
parentf4fbb3ce342bc1c13455209cb9ea63b9f678d159 (diff)
downloadlinux-039df7a7cbccb4ea5527c92134b4535fb5bf9671.tar.bz2
Merge remote-tracking branches 'regulator/fix/bcm590xx', 'regulator/fix/s2m' and 'regulator/fix/s5m8767' into regulator-linus