Merge with /home/wd/git/u-boot/master

author Wolfgang Denk <wd@pollux.denx.de>

Tue, 24 Oct 2006 13:17:59 +0000 (15:17 +0200)

committer Wolfgang Denk <wd@pollux.denx.de>

Tue, 24 Oct 2006 13:17:59 +0000 (15:17 +0200)
author Wolfgang Denk <wd@pollux.denx.de>
Tue, 24 Oct 2006 13:17:59 +0000 (15:17 +0200)
committer Wolfgang Denk <wd@pollux.denx.de>
Tue, 24 Oct 2006 13:17:59 +0000 (15:17 +0200)
diff --cc MAINTAINERS
Simple merge
diff --cc Makefile
Simple merge
diff --cc README
Simple merge
diff --cc drivers/Makefile
Simple merge
author	Wolfgang Denk <wd@pollux.denx.de>
	Tue, 24 Oct 2006 13:17:59 +0000 (15:17 +0200)
committer	Wolfgang Denk <wd@pollux.denx.de>
	Tue, 24 Oct 2006 13:17:59 +0000 (15:17 +0200)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
README	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history