summaryrefslogtreecommitdiff
path: root/drivers/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-05-13 16:22:43 +0300
committerMark Brown <broonie@kernel.org>2016-05-13 16:22:43 +0300
commit93878cd540500884b2ea428f620c8e1426fc4d6d (patch)
tree660f209294aa7598c16a84dc465f55792c24d168 /drivers/regulator
parent5535fc7958efbd68542def0abd6c9e6b3a9e6812 (diff)
parent45fa2038cf7820ecfcca8793b81e656ca3caaf0f (diff)
parenta2151374230820a3a6e654f2998b2a44dbfae4e1 (diff)
downloadlinux-93878cd540500884b2ea428f620c8e1426fc4d6d.tar.xz
Merge remote-tracking branches 'regulator/fix/constrain' and 'regulator/fix/defer' into regulator-linus