Merging Stelian Pop AT91 patches

Merge branch 'testing-V2'

Conflicts:

	board/atmel/at91cap9adk/Makefile
                Fixing copyright
	board/atmel/at91sam9260ek/Makefile
                Fixing copyright
	board/atmel/at91sam9260ek/u-boot.lds
                Delete no more needed ld script

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

diff --cc CHANGELOG
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc MAKEALL
Simple merge

diff --cc Makefile
Simple merge

diff --cc README
Simple merge

diff --cc board/atmel/at91sam9260ek/at91sam9260ek.c
Simple merge

diff --cc common/env_nand.c
Simple merge

diff --cc drivers/net/dm9000x.c
Simple merge

diff --cc drivers/video/Makefile
index 9d2f65b7f8d937a5ce530f36c47c0b36c0542fcc,a07ee0ecafc6bfbfa2d9658d41dc11df71bb7a51..20a54c54dfa62bebc220bfccbedf04224f031ba1
--- 1/drivers/video/Makefile
--- 2/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@@ -23,9 -23,10 +23,10 @@@
  
  include $(TOPDIR)/config.mk
  
 -LIB   := $(obj)libvideo.a
 +LIB   := $(obj)libvideo.a
  
  COBJS-y += ati_radeon_fb.o
+ COBJS-$(CONFIG_ATMEL_LCD) += atmel_lcdfb.o
  COBJS-y += cfb_console.o
  COBJS-y += ct69000.o
  COBJS-y += mb862xx.o

diff --cc fs/jffs2/jffs2_1pass.c
Simple merge

diff --cc tools/Makefile
Simple merge