summaryrefslogtreecommitdiff
path: root/drivers/base
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-03-12 09:50:35 -0700
committerMark Brown <broonie@kernel.org>2018-03-12 09:50:35 -0700
commitf981c6cc14aa1c6cfd4154d2f93846bf83a4725a (patch)
tree2bac9c29f3b8cb6ecabe8c7134e541a3a67398d2 /drivers/base
parentaa584bada6c2114371a415d134f09fc376c8e07b (diff)
parent86effbe0d198aaf57459ec9ad3855e88e29ecb1c (diff)
parentb8f9a03b741ddfdde4aa8b607fa7d88eb63a6338 (diff)
Merge remote-tracking branches 'regmap/fix/i2c' and 'regmap/fix/volatile' into regmap-linus