summaryrefslogtreecommitdiff
path: root/drivers/base
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-06-17 17:40:08 +0100
committerMark Brown <broonie@kernel.org>2015-06-17 17:40:08 +0100
commit8ca006adeffca5c760e86e660018ec9253d53dd3 (patch)
treea7d11153d43f7392d7f521ace8527ade193d53fb /drivers/base
parent4705a81b2c1c1f3a31711f959cf87b4da7b2f06e (diff)
parent1c79771a7270278e6ff486edf4dfeb8c4fc01ee0 (diff)
parente723f2ceb1ab571c660b1a1db31cb71aa2c0b29d (diff)
parenta2f776cbb8271d7149784207da0b0c51e8b1847c (diff)
Merge remote-tracking branches 'regmap/topic/defaults', 'regmap/topic/irq' and 'regmap/topic/reg-params' into regmap-next