summaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-06-22 11:19:49 +0100
committerMark Brown <broonie@kernel.org>2015-06-22 11:19:49 +0100
commit87028bd117a63a608ab690e1a82ffb7223127fe6 (patch)
tree5c2117df3e1a7b0f5eb88917013a823c20fa8b36 /drivers/regulator
parent24ba1bb3ef1970169388d337203030947a928a15 (diff)
parent43343f8d804a84db9b671c95fa253fc1793bf34a (diff)
parentc53403a37cf083ce85da720f18918f73580d0064 (diff)
parent29454738f96233466d5bfacf86c7a8d49f79ae27 (diff)
downloadlinux-87028bd117a63a608ab690e1a82ffb7223127fe6.tar.bz2
Merge remote-tracking branches 'regulator/fix/doc', 'regulator/fix/max77686' and 'regulator/fix/wm831x' into regulator-linus