summaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-05-13 14:23:49 +0100
committerMark Brown <broonie@kernel.org>2016-05-13 14:23:49 +0100
commit4f38c566a0967ce9291537ba04891391681a7661 (patch)
tree22bc983707a2ccc884d21fb3abbcc7b917c49465 /drivers/regulator
parent39d652e0660bbad6a90a21042dc9f22584dfaabd (diff)
parentae714c3b8e50a64d967188f3bc585bcd6a79539d (diff)
parent74d8b45fa344129b3dfd37019877ba68b1287e18 (diff)
downloadlinux-4f38c566a0967ce9291537ba04891391681a7661.tar.bz2
Merge remote-tracking branches 'regulator/topic/tps6524x' and 'regulator/topic/twl' into regulator-next