Merge branch 'topic/coupled' of https://git.kernel.org/pub/scm/linux/kernel/git/broon...
authorMark Brown <broonie@kernel.org>
Mon, 19 Nov 2018 13:16:15 +0000 (13:16 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 19 Nov 2018 13:16:15 +0000 (13:16 +0000)
commitffb8c1e45e7ae648a3a1689aa71be50fb459316e
tree9861dadf0dc742e519e28eabdeee448a57c86170
parenta8d8ee437ea0bf21f840f33ca87f8e1641727aae
parentff9b34b615a37a3f4d359bf82fc97f5e0310b301
Merge branch 'topic/coupled' of https://git./linux/kernel/git/broonie/regulator into regulator-4.21 for trivial conflict
Documentation/devicetree/bindings/regulator/regulator.txt
drivers/regulator/core.c
drivers/regulator/of_regulator.c