lkml.org 
[lkml]   [2010]   [Jul]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: Tree for July 26
Hi Michal,

On Mon, 26 Jul 2010 10:53:20 +0200 Michal Simek <michal.simek@petalogix.com> wrote:
>
> Merging microblaze/next
> CONFLICT (content): Merge conflict in arch/microblaze/mm/init.c
>
> Fixed.

Thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2010-07-26 11:21    [from the cache]
©2003-2011 Jasper Spaans