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

[Stephen Rothwell]

Hi Jiri,

On Mon, 13 Dec 2010 11:01:59 +0100 (CET) Jiri Kosina <jkosina@xxxxxxx> wrote:
>
> Thank you Stephen. If you could carry this fixup patch, then it seems best 
> option for me. This conflict is trivial enough to be resolved later during 
> merge.

Yep, no worries.

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

Attachment: pgp00000.pgp
Description: PGP signature