On Tue, Oct 18, 2016 at 7:42 AM, Simon Glass <s...@chromium.org> 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> -- Jagan Teki Free Software Engineer | www.openedev.com U-Boot, Linux | Upstream Maintainer Hyderabad, India. _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
