On Mon, Oct 17, 2016 at 08:12:34PM -0600, Simon Glass wrote: > These two files have patch merge markers in them, within comments or > strings. Remove then, so that a search for merge markers does not show up > matches in these files. > > Signed-off-by: Simon Glass <s...@chromium.org> > Reviewed-by: Tom Rini <tr...@konsulko.com> > Reviewed-by: Jagan Teki <jt...@openedev.com>
Applied to u-boot/master, thanks! -- Tom
signature.asc
Description: Digital signature
_______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
