summaryrefslogtreecommitdiff
path: root/drivers/base
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-02-08 11:16:11 +0800
committerMark Brown <broonie@kernel.org>2015-02-08 11:16:11 +0800
commit1aff0310ebdd42fa0045440cee19c5a8cfecf70c (patch)
tree1beff2c8d58f9679fbfc9991d3669c3520d2e264 /drivers/base
parentdfdb3c4d18221c5c66a1bfecb76c25b3f95275e8 (diff)
parent927db287ba022b46c78f119539460624fa3af2cf (diff)
parentf27b37f5993a080700ccecdce9960d1563eccd36 (diff)
parent5892ded23c8e9e015b01347222ba4de8a80e7ce2 (diff)
Merge remote-tracking branches 'regmap/topic/ac97', 'regmap/topic/doc' and 'regmap/topic/smbus' into regmap-next