Hi Tom, On 02/09/2015 15:18, Tom Rini wrote: > On Wed, Sep 02, 2015 at 11:57:13AM +0200, Stefano Babic wrote: > >> Hi Tom, >> >> please pull from u-boot-imx, thanks ! >> >> The following changes since commit e3d50d4292ebabdf61f56f3a633cdb3a1e58bf88: >> >> fsl_esdhc.c: Always make check_and_invalidate_dcache_range available >> (2015-08-02 10:27:52 -0400) > > That's actually really old and I get a few non-trivial conflicts. Can > you please rebase on master? Thanks!
You're right - I am solving conflicts and I will send a new PR afterward. Stefano -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected] ===================================================================== _______________________________________________ U-Boot mailing list [email protected] http://lists.denx.de/mailman/listinfo/u-boot
