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: sba...@denx.de ===================================================================== _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
