Merge branch 'master' of /home/stefan/git/u-boot/u-boot

author Stefan Roese <sr@denx.de>

Tue, 3 Jun 2008 18:19:08 +0000 (20:19 +0200)

committer Stefan Roese <sr@denx.de>

Tue, 3 Jun 2008 18:19:08 +0000 (20:19 +0200)
author Stefan Roese <sr@denx.de>
Tue, 3 Jun 2008 18:19:08 +0000 (20:19 +0200)
committer Stefan Roese <sr@denx.de>
Tue, 3 Jun 2008 18:19:08 +0000 (20:19 +0200)
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
author	Stefan Roese <sr@denx.de>
	Tue, 3 Jun 2008 18:19:08 +0000 (20:19 +0200)
committer	Stefan Roese <sr@denx.de>
	Tue, 3 Jun 2008 18:19:08 +0000 (20:19 +0200)
		1	2
MAKEALL	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history