Hi Michal, On Mon, 26 Jul 2010 10:53:20 +0200 Michal Simek <michal.simek@xxxxxxxxxxxxx> wrote: > > Merging microblaze/next > CONFLICT (content): Merge conflict in arch/microblaze/mm/init.c > > Fixed. Thanks. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpdQwSupQKao.pgp
Description: PGP signature
