Hi Mauro,

On Tue, 11 May 2010 20:23:08 -0300 Mauro Carvalho Chehab <mchehab@infradead.org> wrote:
>
> Conflicts solved. They were generated by an upstream merge from
> my fixes tree.

Thanks.

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