From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner+w=401wt.eu-S1752601AbZLABhi@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752601AbZLABhi (ORCPT <rfc822;w@1wt.eu>);
	Mon, 30 Nov 2009 20:37:38 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751824AbZLABhh
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Mon, 30 Nov 2009 20:37:37 -0500
Received: from chilli.pcug.org.au ([203.10.76.44]:39138 "EHLO smtps.tip.net.au"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751017AbZLABhg (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Mon, 30 Nov 2009 20:37:36 -0500
Date: Tue, 1 Dec 2009 12:37:38 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Woodhouse <dwmw2@infradead.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
       David Hunter <hunterd42@gmail.com>,
       Haojian Zhuang <haojian.zhuang@marvell.com>,
       Eric Miao <eric.y.miao@gmail.com>
Subject: linux-next: manual merge of the mtd tree with the pxa tree
Message-Id: <20091201123738.73bd4e4f.sfr@canb.auug.org.au>
X-Mailer: Sylpheed 2.7.1 (GTK+ 2.18.3; i486-pc-linux-gnu)
Mime-Version: 1.0
Content-Type: multipart/signed; protocol="application/pgp-signature";
 micalg="PGP-SHA1";
 boundary="Signature=_Tue__1_Dec_2009_12_37_38_+1100_23sReKEjDeeyQ0Nf"
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

--Signature=_Tue__1_Dec_2009_12_37_38_+1100_23sReKEjDeeyQ0Nf
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi David,

Today's linux-next merge of the mtd tree got a conflict in drivers/mtd/nand=
/pxa3xx_nand.c between commit f923cfbd298a3c5d05fe20712765ed73387b4b3c ("px=
a3xx_nand: fix memory out of bound") from the pxa tree and commit 98ecc914d=
0a48dbbcbb5fc866ab5b59a52afbd41 ("mtd: pxa3xx_nand: Fix PIO data transfer")=
 from the mtd tree.

They seem to be doing the same thing but differently.  I just kept the
version from the pxa tree.
--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

--Signature=_Tue__1_Dec_2009_12_37_38_+1100_23sReKEjDeeyQ0Nf
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEARECAAYFAksUc2IACgkQjjKRsyhoI8zj1wCguULvM4mpuSanQMTWW/wjP5oI
LhkAn3EqEQIfI77E0ZyhM5IDwPwrbdc6
=kC+4
-----END PGP SIGNATURE-----

--Signature=_Tue__1_Dec_2009_12_37_38_+1100_23sReKEjDeeyQ0Nf--