Re: linux-next: manual merge of the staging-next tree with the nettree

From: Stephen Rothwell
Date: Thu May 06 2010 - 00:21:52 EST


Hi Greg,

On Wed, 5 May 2010 21:20:48 -0700 Greg KH <greg@xxxxxxxxx> wrote:
>
> Thanks for doing this. Hm, the arlan driver is scheduled to be deleted
> in .35, so it would make things easier if I just do it now to keep these
> kinds of merge issues from happening. I'll queue that up tomorrow.

Ah, yes, that would be easier. Thanks.

--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature