Re: linux-next: manual merge of the ceph tree with Linus' tree

[Stephen Rothwell]

Hi Sage,

On Thu, 13 May 2010 21:25:45 -0700 (PDT) Sage Weil <sage@xxxxxxxxxxxx> wrote:
>
> Aie, sorry...  I rebased everything queued for the next window yesterday 
> but forgot to update the for-next tag.  These conflicts should all 
> disappear next time around.

Thanks.

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

Attachment: pgp00000.pgp
Description: PGP signature