7 Aug
2007
7 Aug
'07
4:57 p.m.
In message 46B84A47.3030908@compulab.co.il you wrote:
Signed-off-by: Mike Rapoport mike@compulab.co.il
Ditto:
error: patch failed: include/asm-arm/arch-pxa/pxa-regs.h:150 error: include/asm-arm/arch-pxa/pxa-regs.h: patch does not apply Using index info to reconstruct a base tree... error: patch failed: include/asm-arm/arch-pxa/pxa-regs.h:150 error: include/asm-arm/arch-pxa/pxa-regs.h: patch does not apply Did you hand edit your patch? It does not apply to blobs recorded in its index. 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@denx.de
It became apparent that one reason why the Ice Giants were known as
the Ice Giants was because they were, well, giants. The other was
that they were made of ice. -Terry Pratchett, _Sourcery_