]> git.baikalelectronics.ru Git - uboot.git/commit
projects / uboot.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 251cdc4) | patch
Remove some merge markers
authorSimon Glass <sjg@chromium.org>
Tue, 18 Oct 2016 02:12:34 +0000 (20:12 -0600)
committerTom Rini <trini@konsulko.com>
Sun, 23 Oct 2016 22:33:18 +0000 (18:33 -0400)
commit0737d44486d48436733e6b3d1bc8ff5d02be8d5f
tree48a48bcf9369a018d2c8ba90f5cf5ea90f8a6ae2tree | snapshot
parent251cdc438a153c6da3e3d5febb883e8547f2e41dcommit | diff
Remove some merge markers

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@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Jagan Teki <jteki@openedev.com>
drivers/net/ax88180.c diff | blob | history
drivers/usb/host/isp116x-hcd.c diff | blob | history
"Das U-Boot" Source Tree.