From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753961Ab0GZJTK (ORCPT ); Mon, 26 Jul 2010 05:19:10 -0400 Received: from chilli.pcug.org.au ([203.10.76.44]:42808 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752006Ab0GZJTJ (ORCPT ); Mon, 26 Jul 2010 05:19:09 -0400 Date: Mon, 26 Jul 2010 19:19:02 +1000 From: Stephen Rothwell To: michal.simek@petalogix.com Cc: linux-next@vger.kernel.org, LKML Subject: Re: linux-next: Tree for July 26 Message-Id: <20100726191902.5ebe1030.sfr@canb.auug.org.au> In-Reply-To: <4C4D4D00.30304@petalogix.com> References: <20100726154809.7f42c137.sfr@canb.auug.org.au> <4C4D4D00.30304@petalogix.com> X-Mailer: Sylpheed 3.0.2 (GTK+ 2.20.1; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA1"; boundary="Signature=_Mon__26_Jul_2010_19_19_02_+1000_N7UCA4zptlApcS4x" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Signature=_Mon__26_Jul_2010_19_19_02_+1000_N7UCA4zptlApcS4x Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Michal, On Mon, 26 Jul 2010 10:53:20 +0200 Michal Simek wrote: > > Merging microblaze/next > CONFLICT (content): Merge conflict in arch/microblaze/mm/init.c >=20 > Fixed. Thanks. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ --Signature=_Mon__26_Jul_2010_19_19_02_+1000_N7UCA4zptlApcS4x Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iQEcBAEBAgAGBQJMTVMGAAoJEDMEi1NhKgbsHMUH/iuHBd7nYzJ1A6JihXQ/k2T+ mX7f6hecpxCDEJ9/hVO1N/lk2GJ658oVwbWEyGB4J16cd2ZYnhhHCTqHd1c47hKW ebI43Yw39rL1negCU6eTnCp2so7bh8y5Z3OsZvtS94EMSHY5IJL3FjfbPB/b4Q8k s+cuOwMwzYhz93BdgD4PX2yoNKoHQRbKvglNrX7qkPZLF8lMWB5j/Msa5Bk9GR7u sKhVNo1ha3oHRD2ZuFpv4QSITCxaJwA4idkSIB+zaqf2DiqUlZfvfwD06A2gEaX7 dbYCH7lzU5cB2jyKfoGLLyrq9qal9sgfZglTTGWvXQHMYs//mMX80zJfNh9MgyE= =Ks9m -----END PGP SIGNATURE----- --Signature=_Mon__26_Jul_2010_19_19_02_+1000_N7UCA4zptlApcS4x--