summaryrefslogtreecommitdiff
path: root/drivers/base
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-11-26 13:16:56 +0000
committerMark Brown <broonie@linaro.org>2013-11-26 13:16:56 +0000
commit652787ab1aca35e5e85e644757f7ea2cc00681d1 (patch)
tree4f9d40ba4561bcf6ee2120c7f7acc6908ad48038 /drivers/base
parenta46b6e72839d09fb6770e0c2357dde23e31036e1 (diff)
parent0093380c18a4bfc5526577da576335d08bdea2e5 (diff)
parent6b8e090ecc3dc977fe2eabf6e50bb3870de9ebac (diff)
Merge remote-tracking branches 'regmap/fix/doc' and 'regmap/fix/mmio' into regmap-linus