[U-Boot] [PATCH 3/5] NetStar: use generic flash driver

Wolfgang Denk
2009-03-18T19:44:20Z

Dear Ladislav Michl,

In message <20090316222932.GD1879@localhost.localdomain> you wrote:
> Use generic flash driver.
>
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>

Does not apply to me:

Applying: NetStar: use generic flash driver
error: patch failed: include/configs/netstar.h:106
error: include/configs/netstar.h: patch does not apply
error: patch failed: board/netstar/netstar.c:21
error: board/netstar/netstar.c: patch does not apply
error: patch failed: board/netstar/Makefile:28
error: board/netstar/Makefile: patch does not apply
fatal: sha1 information is lacking or useless
(include/configs/netstar.h).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001.

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 release of emotion is what keeps us health. Emotionally
healthy."
"That may be, Doctor. However, I have noted that the healthy release
of emotion is frequently unhealthy for those closest to you."
-- McCoy and Spock, "Plato's Stepchildren", stardate 5784.3