In message <[EMAIL PROTECTED]> you wrote: > The Makefiles for the AT91CAP9/AT91SAM9 boards have an incomplete > copyright notice. This patch adds the missing pieces. > > Signed-off-by: Stelian Pop <[EMAIL PROTECTED]> > --- > board/atmel/at91cap9adk/Makefile | 4 ++++ > board/atmel/at91sam9260ek/Makefile | 4 ++++ > 2 files changed, 8 insertions(+), 0 deletions(-)
Does not apply to currnt tree: Applying Add proper copyright notices in Atmel boards Makefiles error: patch failed: board/atmel/at91cap9adk/Makefile:2 error: board/atmel/at91cap9adk/Makefile: patch does not apply error: patch failed: board/atmel/at91sam9260ek/Makefile:2 error: board/atmel/at91sam9260ek/Makefile: patch does not apply fatal: sha1 information is lacking or useless (board/atmel/at91cap9adk/Makefile). 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: [EMAIL PROTECTED] Always try to do things in chronological order; it's less confusing that way. ------------------------------------------------------------------------- This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone _______________________________________________ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
