summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-11-06 11:39:41 +0000
committerMark Brown <broonie@kernel.org>2017-11-06 11:39:41 +0000
commita15fdc340db10ac6f8d73e11f966f012a5e938a7 (patch)
treeb72fa6b23997624d3839d616a6c0f7f87bc2cdaf /drivers
parente7f774c94254adf43e05f84d7501eff0ccd9d5b9 (diff)
parent9c2e5cb38da2202c6591efec631562116761521f (diff)
parentc077fadf4d1e05bcdd7ddb07758cbd8acf0033f6 (diff)
Merge remote-tracking branches 'regmap/topic/const' and 'regmap/topic/hwspinlock' into regmap-next