Dear Tom, In message <1374671685-21577-1-git-send-email-tr...@ti.com> you wrote: > > The Licenses/Exceptions file describes the standalone license exception. > Add back our long-standing introductory remarks to Licenses/README and > fix a few spelling problems > > Signed-off-by: Wolfgang Denk <w...@denx.de> > [trini: Grab differences between v1 and v3, apply separately, to avoid a > new branch on Wolfgang's side] > Signed-off-by: Tom Rini <tr...@ti.com> > ---
If possible, please squash this into "[1/5] Licenses: introduce SPDX Unique Lincense Identifiers" commit; the cmd_io.c fix (sorry for that, and thanks for fixing it!) should also be squashed into the commit that causes the breakage. If you want, I can provide a new branch / rebase the existing one? Thanks!! Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de On our campus the UNIX system has proved to be not only an effective software tool, but an agent of technical and social change within the University. - John Lions (U. of Toronto (?)) _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot