diff options
author | Mark Brown <broonie@kernel.org> | 2016-06-13 16:51:57 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-06-13 16:51:57 +0100 |
commit | 0d2a8ef4395e84aa9623ac1e282417c75a73490c (patch) | |
tree | b7d56af2d4f89bbb58bf402a6775de73d14b96c5 /scripts | |
parent | 5edb56491d4812c42175980759da53388e5d86f5 (diff) | |
parent | 3bfbb4d1a480cc17f6ccfce13b76eb6c0dbeaf8c (diff) | |
parent | c714a588fc39dc8c8f70014f5691217717983fb3 (diff) |
Merge remote-tracking branches 'regulator/fix/qcom-smd' and 'regulator/fix/tps51632' into regulator-linus