Messages in this thread | | | Date | Thu, 17 Dec 2015 11:22:01 +0000 | From | Mark Brown <> | Subject | Re: linux-next: manual merge of the regulator tree with the qcom tree |
| |
On Thu, Dec 17, 2015 at 01:01:29PM +1100, Stephen Rothwell wrote:
> between commit:
> f6251e80956d ("soc: qcom: documentation: Update SMD/RPM Docs") > 9ee8373a1552 ("soc: qcom: smd-rpm: Add existing platform support")
> from the qcom tree and commit:
> 7a400585893e ("soc: qcom: documentation: Update SMD/RPM Docs")
> from the regulator tree.
> I fixed it up (I used the qcom tree version - please sort out the > mess).
Andy, what's going on here? [unhandled content-type:application/pgp-signature] | |