Re: linux-next: manual merge of the input tree with the davincitree

[Stephen Rothwell]

Hi Dmitry,

On Mon, 20 Sep 2010 22:24:38 -0700 Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx> 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@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature