Merge remote branch 'u-boot-at91/for-1.3.4'
authorWolfgang Denk <wd@denx.de>
Mon, 2 Jun 2008 22:24:36 +0000 (00:24 +0200)
committerWolfgang Denk <wd@denx.de>
Mon, 2 Jun 2008 22:24:36 +0000 (00:24 +0200)
1  2 
MAINTAINERS
MAKEALL
Makefile
lib_arm/board.c

diff --cc MAINTAINERS
Simple merge
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
diff --cc lib_arm/board.c
Simple merge