From: Wolfgang Denk Date: Mon, 07 Dec 2009 23:02:20 +0100 Subject: [U-Boot] [PATCH] tools/mkimage: Remove duplicate line of code In-Reply-To: <1260084804-11229-1-git-send-email-ptyser@xes-inc.com> References: <1260084804-11229-1-git-send-email-ptyser@xes-inc.com> Message-ID: <20091207220220.8BAA93F6CC@gemini.denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Dear Peter Tyser, In message <1260084804-11229-1-git-send-email-ptyser@xes-inc.com> you wrote: > Recent commits 1a99de2cb4d08eb3bf9fb3f60a9d533150de8c0e and > 6a590c5f5fd12cdd27f3153522acfac3854590e7 both fixed the same bug in the > same manner. Unfortunately git was "smart" enough to merge both changes > which resulted in some duplicate code. > > Signed-off-by: Peter Tyser > --- > tools/mkimage.c | 1 - > 1 files changed, 0 insertions(+), 1 deletions(-) Thanks, applied - but I decided to reorder the code and comment a bit. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de Children are natural mimics who act like their parents despite every effort to teach them good manners.