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

author Stefan Roese <sr@denx.de>

Thu, 17 Jan 2008 15:04:12 +0000 (16:04 +0100)

committer Stefan Roese <sr@denx.de>

Thu, 17 Jan 2008 15:04:12 +0000 (16:04 +0100)
author Stefan Roese <sr@denx.de>
Thu, 17 Jan 2008 15:04:12 +0000 (16:04 +0100)
committer Stefan Roese <sr@denx.de>
Thu, 17 Jan 2008 15:04:12 +0000 (16:04 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
author	Stefan Roese <sr@denx.de>
	Thu, 17 Jan 2008 15:04:12 +0000 (16:04 +0100)
committer	Stefan Roese <sr@denx.de>
	Thu, 17 Jan 2008 15:04:12 +0000 (16:04 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
MAKEALL	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history