Messages in this thread | | | Date | Thu, 17 Dec 2015 18:03:22 +0000 | From | Mark Brown <> | Subject | Re: linux-next: manual merge of the regulator tree with the qcom tree |
| |
On Thu, Dec 17, 2015 at 11:58:22AM -0600, Andy Gross wrote: > On Thu, Dec 17, 2015 at 11:22:01AM +0000, Mark Brown wrote:
> > > 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.
OK, great - thanks. [unhandled content-type:application/pgp-signature] | |