Re: linux-next: Tree for December 4

[Stephen Rothwell]

Hi Michal,

On Fri, 04 Dec 2009 10:44:28 +0100 Michal Simek <michal.simek@xxxxxxxxxxxxx> wrote:
>
>  > Merging microblaze/next
>  > CONFLICT (content): Merge conflict in drivers/serial/of_serial.c
> 
> I removed that my first patch from my next branch - it is in tty tree.

Thanks.

It is actually in Linus' tree now.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature