Searched hist:"53302 bdc480ac8c36ec4da8bd444c63f7872ba02" (Results 1 – 1 of 1) sorted by relevance
| /rk3399_rockchip-uboot/drivers/net/ |
| H A D | ax88180.c | 53302bdc480ac8c36ec4da8bd444c63f7872ba02 Tue Oct 18 02:12:34 UTC 2016 Simon Glass <sjg@chromium.org> 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>
|