summaryrefslogtreecommitdiff
path: root/drivers/base
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-10-04 05:17:12 +0200
committerMark Brown <broonie@kernel.org>2016-10-04 05:17:12 +0200
commitf785fb2ec0cbe73165333ea1f23cce36c7fc2521 (patch)
tree19ee0a90bc7fcb6f4494b3dc6d5ca429a240198c /drivers/base
parentc8d2bc9bc39ebea8437fd974fdbc21847bb897a3 (diff)
parent55562449032c43b84f839e2fbb84bf1d351d6603 (diff)
parent359a2f17604e2c1c8938be2bba32a8cef9cf6303 (diff)
Merge remote-tracking branches 'regmap/topic/core' and 'regmap/topic/debugfs' into regmap-next