[U-Boot] [PATCH v2 0/4] get at91rm9200ek working with ARM relocation

[Wolfgang Denk]

Dear Reinhard Meyer,

In message <4CFC0966.4010303 at emk-elektronik.de> you wrote:
>
> What's possible in git-rebase should be possible in git-am, too.

git-rebase will also show merge conflicts in such cases.

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
God may be subtle, but He isn't plain mean.         - Albert Einstein