[U-Boot] [PATCH][v2] mpc8260: remove Ethernet node fixup to use generic FDT code.

[Wolfgang Denk]

Dear Marcel Ziswiler,

In message <1252523600.3643.6.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 Heiko's tested-by
> 
>  board/keymile/mgcoge/mgcoge.c |    5 -----
>  board/muas3001/muas3001.c     |   15 ---------------
>  include/configs/mgcoge.h      |    1 +
>  include/configs/muas3001.h    |    1 +
>  4 files changed, 2 insertions(+), 20 deletions(-)

Patch does not apply:

Applying: mpc8260: remove Ethernet node fixup to use generic FDT code.
error: patch failed: board/muas3001/muas3001.c:342
error: board/muas3001/muas3001.c: patch does not apply
fatal: sha1 information is lacking or useless (board/muas3001/muas3001.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
Perl itself is  usually  pretty  good  about  telling  you  what  you
shouldn't do. :-)     - Larry Wall in <11091 at jpl-devvax.JPL.NASA.GOV>