[U-Boot] [PATCH][v3] mpc8260: move FDT memory node fixup into common CPU code.

[Wolfgang Denk]

Dear Marcel Ziswiler,

In message <1252524034.3643.10.camel at com-21> you wrote:
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler at noser.com>
> Tested-by: Heiko Schocher <hs at denx.de>
> ---
> Changes since v1:
> - Added previously missed mgcoge board as pointed out by Peter Tyser and Heiko
> - Moved the board-specific Ethernet modifications into separate patch
> Changes since v2:
> - Added Heiko's tested-by
> 
>  board/freescale/mpc8260ads/mpc8260ads.c |   13 -------------
>  board/ids8247/ids8247.c                 |   16 ----------------
>  board/keymile/mgcoge/mgcoge.c           |    8 +-------
>  board/muas3001/muas3001.c               |   16 ----------------
>  cpu/mpc8260/cpu.c                       |    1 +
>  5 files changed, 2 insertions(+), 52 deletions(-)

Patch does not apply:

Applying: mpc8260: move FDT memory node fixup into common CPU code.
error: patch failed: board/muas3001/muas3001.c:308
error: board/muas3001/muas3001.c: patch does not apply
fatal: sha1 information is lacking or useless (board/keymile/mgcoge/mgcoge.c).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001.

Please fix and repost.

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
Far back in the mists of ancient time, in the great and glorious days
of the former Galactic Empire, life was wild, rich  and  largely  tax
free.         - Douglas Adams, _The Hitchhiker's Guide to the Galaxy_