summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-08-05 18:29:27 +0100
committerMark Brown <broonie@linaro.org>2014-08-05 18:29:27 +0100
commitf71f26274d4c1c0898a057cf706bb1192fc63021 (patch)
tree571715a48921116dcb68ed97e334eabbbf8e01b8 /include
parentd5b5d9d43b5e1b1c43a00ad15a3605a41270e761 (diff)
parentcad35c3f463ddfaff519e037cceac4ad971a9d60 (diff)
parent448b55c2a360a2d531d9e4b78bc87ecc2d235782 (diff)
parent0a3ade7ec29bb616c0530ca23749493171970064 (diff)
parent4f2352cf52738bd980713e85e8ae631c6c3a8feb (diff)
Merge remote-tracking branches 'regulator/topic/s2mps11', 'regulator/topic/s2mpu02', 'regulator/topic/s5m8767' and 'regulator/topic/tps65090' into regulator-next