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

From: Stephen Rothwell
Date: Thu Feb 18 2010 - 22:46:46 EST


Hi Jonathan,

On Thu, 18 Feb 2010 15:16:19 +0000 Jonathan Cameron <jic23@xxxxxxxxx> wrote:
>
> I've reset that last patch, merged Linus' current tree and reapplied it on top with the
> merge problems fixed up. While I was there I edited the commit message so it was actually
> English (oops).
>
> Anyhow, (fingers crossed), it should now work fine.

Thanks.

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

Attachment: pgp00000.pgp
Description: PGP signature