Merge with /home/m8/git/u-boot

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

Wed, 5 Jul 2006 08:03:52 +0000 (10:03 +0200)

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

Wed, 5 Jul 2006 08:03:52 +0000 (10:03 +0200)
author Wolfgang Denk <wd@pollux.denx.de>
Wed, 5 Jul 2006 08:03:52 +0000 (10:03 +0200)
committer Wolfgang Denk <wd@pollux.denx.de>
Wed, 5 Jul 2006 08:03:52 +0000 (10:03 +0200)
diff --cc CHANGELOG
Simple merge
diff --cc MAKEALL
Simple merge
author	Wolfgang Denk <wd@pollux.denx.de>
	Wed, 5 Jul 2006 08:03:52 +0000 (10:03 +0200)
committer	Wolfgang Denk <wd@pollux.denx.de>
	Wed, 5 Jul 2006 08:03:52 +0000 (10:03 +0200)
		1	2
CHANGELOG	patch \|	diff1 \|	diff2 \|	blob \| history
MAKEALL	patch \|	diff1 \|	diff2 \|	blob \| history