mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-10-02 09:30:43 +09:00
53302bdc48
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> |
||
---|---|---|
.. | ||
common | ||
dwc3 | ||
emul | ||
eth | ||
gadget | ||
host | ||
musb | ||
musb-new | ||
phy | ||
ulpi | ||
Kconfig |