On Tue, Oct 08, 2013 at 02:51:24PM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote: > On 13:34 Sun 06 Oct , Sascha Hauer wrote: > > On Thu, Oct 03, 2013 at 11:59:57AM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote: > > > Hi, > > > > > > v2 update comment and fix comment typo > > > and rebase next > > > > > > The following changes since commit 705dbd7c795bbdfb448e1d0ace89d98cbceaaec1: > > > > > > Merge branch 'for-next/tegra' into next (2013-10-02 11:07:14 +0200) > > > > > > are available in the git repository at: > > > > > > > > > git://git.jcrosoft.org/barebox.git delivery/bpkfs > > > > > > for you to fetch changes up to 6edfa631c4aafd71d0508b94c7cdea87695dd492: > > > > Applied, thanks. > > > > Please only post patches against -next when you know there are > > dependencies to patches in -next. Otherwise always post them against > > master as this is the branch I'll apply them on. > here there is conflict with uimagefs I'll resolve those trivial conflicts here on my side. Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox