diff options
author | Mark Brown <broonie@linaro.org> | 2013-11-26 13:16:56 +0000 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-11-26 13:16:56 +0000 |
commit | 652787ab1aca35e5e85e644757f7ea2cc00681d1 (patch) | |
tree | 4f9d40ba4561bcf6ee2120c7f7acc6908ad48038 | |
parent | a46b6e72839d09fb6770e0c2357dde23e31036e1 (diff) | |
parent | 0093380c18a4bfc5526577da576335d08bdea2e5 (diff) | |
parent | 6b8e090ecc3dc977fe2eabf6e50bb3870de9ebac (diff) |
Merge remote-tracking branches 'regmap/fix/doc' and 'regmap/fix/mmio' into regmap-linus