]> git.sur5r.net Git - u-boot/commit
projects / u-boot / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b0a928a) | 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)
commit53302bdc480ac8c36ec4da8bd444c63f7872ba02
tree48a48bcf9369a018d2c8ba90f5cf5ea90f8a6ae2tree | snapshot
parentb0a928a15d7825c08f3be1a3ec5c4bcd8b465fd8commit | 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
Cloned from git://git.denx.de/u-boot.git