summaryrefslogtreecommitdiff
path: root/drivers/regulator
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2014-07-09 13:55:13 (GMT)
committerLee Jones <lee.jones@linaro.org>2014-07-09 13:55:13 (GMT)
commit6ec9dc323b0fd4b83e6da64acc871f74508c0077 (patch)
tree0f2ca300f22c35916d741ca397a3f25f3d26aeab /drivers/regulator
parent342d669c1ee421323f552a62729d3a3d0065093c (diff)
parent8dbf2aa3c308ade864261e8047b0dce1f4ed9a7e (diff)
parent6291e7153a173f85bbdb13bf0c72fa11b5d74bc0 (diff)
downloadlinux-6ec9dc323b0fd4b83e6da64acc871f74508c0077.tar.xz
Merge branches 'ib-mfd-extcon-regulator-3.17', 'ib-mfd-gpio-3.17' and 'ib-mfd-mmc-3.17' into ibs-for-mfd-merged