From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stefano Babic <sbabic@denx.de>
Date: Sat, 11 May 2013 11:39:58 +0200
Subject: [U-Boot] [PULL] : Please pull u-boot-imx - correction
In-Reply-To: <20130511111509.15eacd6d@lilith>
References: <5188B35C.5030401@denx.de> <20130511093057.652ad7c4@lilith>
	<20130511111509.15eacd6d@lilith>
Message-ID: <518E11EE.7050907@denx.de>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

On 11/05/2013 11:15, Albert ARIBAUD wrote:

Hi Albert,

>> Applied to u-boot-arm/master (with two trivial merge resolutions),
>> thanks!
> 
> Seems like the trivial merge resolution was less trivial than I thought
> it was -- I accidentally removed from drivers/mtd/nand/mxc_nand_spl.c
> the definitions for nand_init() and nand_deselect(). For some reason
> I missed it in the MAKEALL -a arm I did. Rolling back and fixing this.

Please make modifications on top of your current tree - after your first
e-mail, I have already pulled from u-boot-arm and pushed to the server.
If you go back, I had to rebase my tree.

Best regards,
Stefano


-- 
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================