On Thu, Nov 3, 2011 at 11:17 AM, Albert ARIBAUD <albert.u.b...@aribaud.net> wrote: > Hi Sandeep, > > Le 03/11/2011 18:52, Paulraj, Sandeep a écrit : >> >> >>> Subject: Re: [U-Boot] Please pull u-boot-ti/master >>> >>> s-paul...@ti.com wrote: >>>> Albert, >>>> Please pull u-boot-ti/master >>>> >>>> Regards, >>>> Sandeep >>>> >>>> >>>> The following changes since commit >>> ce5207e191c59b3135303fd03b98dd2ac3701ba2: >>>> Kyle Moffett (1): >>>> e1000: Allow direct access to the E1000 SPI EEPROM device >>>> >>>> are available in the git repository at: >>>> >>>> git://git.denx.de/u-boot-ti.git master >>>> >>> >>> Hi Sandeep, >>> yesterday I sent two patches to make the dig297 board compile again >>> after the mach-types sync. Did you receive them? >>> >>> http://lists.denx.de/pipermail/u-boot/2011-November/108000.html >>> http://lists.denx.de/pipermail/u-boot/2011-November/108001.html >> >> Hi Luca, >> >> Pushed to u-boot-ti master >> >> Hi Albert, >> >> Can you please pick up these 2 as well from my master. > > Branch u-boot-ti/master is based on u-boot/master whereas it should be > based on u-boot-arm/master. Please rebase and as Wolfgang asks, submit a > formal pull req based on u-boot-arm/master. Currently, that would be > commit 6d66073614539d94dabff1f63ebd962840c44b81 ("arm/km: portl2 > environment address update to P1B").
Sorry, my fault there. It looks like it'll be a real easy rebase at least. -- Tom _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot