[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20100726191902.5ebe1030.sfr@canb.auug.org.au>
Date: Mon, 26 Jul 2010 19:19:02 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: michal.simek@...alogix.com
Cc: linux-next@...r.kernel.org, LKML <linux-kernel@...r.kernel.org>
Subject: Re: linux-next: Tree for July 26
Hi Michal,
On Mon, 26 Jul 2010 10:53:20 +0200 Michal Simek <michal.simek@...alogix.com> wrote:
>
> Merging microblaze/next
> CONFLICT (content): Merge conflict in arch/microblaze/mm/init.c
>
> Fixed.
Thanks.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists