[U-Boot] [U-Boot,v4,01/29] Remove some merge markers

[Tom Rini]

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 <sjg at chromium.org>
> Reviewed-by: Tom Rini <trini at konsulko.com>
> Reviewed-by: Jagan Teki <jteki at openedev.com>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20161023/8a8b6b47/attachment.sig>