lkml.org 
[lkml]   [2010]   [Sep]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the input tree with the davinci tree
Hi Dmitry,

On Mon, 20 Sep 2010 22:24:38 -0700 Dmitry Torokhov <dmitry.torokhov@gmail.com> wrote:
>
> I am afraid you'll have to carry this one till the next merge window -
> it seemed that Davinci drivers better be merged through davinci tree so
> we'll have this conflict.
>
> Sorry about this.

Its not really a problem.

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2010-09-21 09:05    [from the cache]
©2003-2011 Jasper Spaans