lkml.org 
[lkml]   [2009]   [Dec]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: Tree for December 4
Hi Michal,

On Fri, 04 Dec 2009 10:44:28 +0100 Michal Simek <michal.simek@petalogix.com> 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@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2009-12-04 11:47    [from the cache]
©2003-2011 Jasper Spaans