Re: linux-next: net merge conflicts

[Stephen Rothwell]

Hi Dave,

On Thu, 27 Mar 2008 20:15:26 -0700 (PDT) David Miller <davem@xxxxxxxxxxxxx> wrote:
>
> I've resolved this merge issue just an hour ago, can you rebuild the
> linux-next tree with what I just pushed into my net-2.6.26 tree?

Not today.  next time :-)

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

Attachment: pgp00000.pgp
Description: PGP signature