lkml.org 
[lkml]   [2015]   [Dec]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: 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]
\
 
 \ /
  Last update: 2015-12-17 19:21    [W:0.060 / U:0.728 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site