[U-Boot] [PATCH] tools/mkenvimage.c: Fix a merge issue

[Wolfgang Denk]

Dear Horst Kronstorfer,

In message <1324723318-32752-1-git-send-email-hkronsto at frequentis.com> you wrote:
> With bfcc40bb09b05c90cc3b1496abb270eb8aa72134 'optopt' was reverted.
> 
> Signed-off-by: Horst Kronstorfer <hkronsto at frequentis.com>
> ---
>  tools/mkenvimage.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)

Applied, thanks.

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
"The net result is a system that is not only binary  compatible  with
4.3  BSD, but is even bug for bug compatible in almost all features."
- Avadit  Tevanian,  Jr.,  "Architecture-Independent  Virtual  Memory
Management  for  Parallel  and  Distributed  Environments:  The  Mach
Approach"