summaryrefslogtreecommitdiff
path: root/drivers/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-09-04 17:22:09 +0100
committerMark Brown <broonie@kernel.org>2015-09-04 17:22:09 +0100
commit84fb9015d20dc12a2d36f7d775700a53cc45ad90 (patch)
tree8a9c0d58b6315337b33c4b336601f20e3feae021 /drivers/regulator
parenta458a6d411b86de7a2a8e51f9016cf017d5ed545 (diff)
parentad3a942bd22fd40a0f4ddaf2759946ce945662af (diff)
parente874e6c7edc43436f73cf84157d9221f8b807c36 (diff)
Merge remote-tracking branches 'regmap/topic/debugfs' and 'regmap/topic/force-update' into regmap-next