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

[Jiri Kosina]

On Mon, 22 Feb 2010, Stephen Rothwell wrote:

> Hi Jiri,
> 
> Today's linux-next merge of the trivial tree got a conflict in
> arch/sparc/kernel/leon_kernel.c between commit
> 0da2b300b91ddeb9944c3fb4faaf78c1c482c0af ("sparc: remove trailing space
> in messages") from the sparc tree and commit
> 3ad2f3fbb961429d2aa627465ae4829758bc7e07 ("tree-wide: Assorted spelling
> fixes") from the trivial tree.
> 
> The former also fixed the spelling mistake fixed by the latter.

Thanks, I have reverted the chunk in question in my tree.

-- 
Jiri Kosina
SUSE Labs, Novell Inc.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/