[U-Boot-Users] [PATCH 04/26] Add proper copyright notices in Atmel boards Makefiles

[Wolfgang Denk]

In message <1210279954-28692-5-git-send-email-stelian at popies.net> 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 <stelian at popies.net>
> ---
>  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: wd at denx.de
Always try to do things in chronological order; it's  less  confusing
that way.