diff options
author | Mark Brown <broonie@kernel.org> | 2016-09-06 12:31:34 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-09-06 12:31:34 +0100 |
commit | 78cefcbe60de8069c7382bcc15570873ba01f489 (patch) | |
tree | 755ad1757000d50e2c2425dbeba1dc499b0d4b58 /drivers | |
parent | c6935931c1894ff857616ff8549b61236a19148f (diff) | |
parent | cea8aa3a93d1734816e1e3f7b118e1dddf3f4aaa (diff) | |
parent | c488f0071eacd10a290df4fb34bbdeb4eb8e7888 (diff) |
Merge remote-tracking branches 'regulator/fix/email' and 'regulator/fix/qcom-smd' into regulator-linus