Re: [U-Boot] [PATCH 01/28] Remove some merge markers

2016-09-23 Thread Tom Rini
On Mon, Sep 19, 2016 at 04:32:45PM -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 Reviewed-by: Tom Rini -- To

[U-Boot] [PATCH 01/28] Remove some merge markers

2016-09-19 Thread Simon Glass
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 --- drivers/net/ax88180.c | 6 +- drivers/usb/host/isp116x-hcd.c | 6 +++--- 2 files cha