From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tom Rini Date: Wed, 2 Sep 2015 17:58:13 -0400 Subject: [U-Boot] [PULL] Please pull u-boot-imx In-Reply-To: <55E703C2.7010609@denx.de> References: <55E6C7F9.1010300@denx.de> <20150902131836.GU25532@bill-the-cat> <55E6FD5E.9070508@denx.de> <55E703C2.7010609@denx.de> Message-ID: <20150902215813.GY25532@bill-the-cat> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Wed, Sep 02, 2015 at 04:12:18PM +0200, Stefano Babic wrote: > Hi Tom, > > On 02/09/2015 15:45, Stefano Babic wrote: > > 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. > > > > Conflicts are solved - I had to rebase, sorry for that! > > Can you try again to take my PR ? Applied to u-boot/master, thanks! -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: