Re: linux-next: manual merge of the trivial tree with the tree

[Stephen Rothwell]

Hi Jiri,

On Mon, 8 Feb 2010 15:48:08 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the trivial tree got a conflict in
> arch/mips/alchemy/common/reset.c between commit
> 139047ceae71916626ee36bea9ef35f1030aabfe ("MIPS: Alchemy: get rid of
> common/reset.c") from the  tree and commit
                            ^
mips tree, of course.

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

Attachment: pgp00000.pgp
Description: PGP signature