summaryrefslogtreecommitdiff
path: root/drivers/base
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-02-03 12:34:59 +0100
committerMark Brown <broonie@kernel.org>2017-02-03 12:34:59 +0100
commit90e51e6dd27d6418358ec6c9964d54ca9c25c1b9 (patch)
treeb08793dc29e388b1d448968746a15c13ba52772e /drivers/base
parent3b94bdd18106cf38adde4a4257ad69d9a3187c07 (diff)
parent2cf8e2dfdf88363476f23bc600745250b94dbbed (diff)
parent671a911bb9aea07360cb253e98acb4b7e6fbdd07 (diff)
Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/rbtree' into regmap-next