From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Babic Date: Sat, 05 Apr 2014 14:09:08 +0200 Subject: [U-Boot] [PULL] : Please pull u-boot-imx In-Reply-To: References: <533C40B6.6090701@denx.de> <533D0E98.2090600@denx.de> <533EB920.5090202@denx.de> Message-ID: <533FF264.9050807@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On 05/04/2014 13:03, Albert ARIBAUD wrote: > On Sat, 5 Apr 2014 10:22:03 +0200, Albert ARIBAUD > wrote: > >> Hi Stefano, >> >> On Fri, 04 Apr 2014 15:52:32 +0200, Stefano Babic >> wrote: >> >>> Hi Albert, >>> >>> On 03/04/2014 09:32, Stefano Babic wrote: >>> >>>>>> This fails to merge with current u-boot-arm/master. Can you have a look? >>>>>> Or I have a closer look (much) later tonight. >>>>> >>>>> Stefano, I had a look, and I'd rather you solved the merge conflict. >>> >>> Conflicts are solved - I have already pull u-boot-arm/master. I hope you >>> have no problem to pull u-boot-imx now. >> >> Thanks. Can you just send out a new PR? > Done ! Thanks, 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 =====================================================================