Merge branch 'master' of git://git.denx.de/u-boot-at91

author Wolfgang Denk <wd@denx.de>

Sat, 8 Nov 2008 23:09:51 +0000 (00:09 +0100)

committer Wolfgang Denk <wd@denx.de>

Sat, 8 Nov 2008 23:09:51 +0000 (00:09 +0100)
author Wolfgang Denk <wd@denx.de>
Sat, 8 Nov 2008 23:09:51 +0000 (00:09 +0100)
committer Wolfgang Denk <wd@denx.de>
Sat, 8 Nov 2008 23:09:51 +0000 (00:09 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
author	Wolfgang Denk <wd@denx.de>
	Sat, 8 Nov 2008 23:09:51 +0000 (00:09 +0100)
committer	Wolfgang Denk <wd@denx.de>
	Sat, 8 Nov 2008 23:09:51 +0000 (00:09 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
MAKEALL	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history