Re: [U-Boot-Users] [PATCH] make MAKEALL more immune to mergeconflicts