On Thu, Dec 17, 2015 at 11:22:01AM +0000, Mark Brown wrote:
> 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?
I hadn't reformulated my next branch before Stephen pulled again. My
mistake and it was fixed last night, but not in time.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
