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

author Wolfgang Denk <wd@denx.de>

Wed, 11 Jun 2008 20:54:47 +0000 (22:54 +0200)

committer Wolfgang Denk <wd@denx.de>

Wed, 11 Jun 2008 20:54:47 +0000 (22:54 +0200)
author Wolfgang Denk <wd@denx.de>
Wed, 11 Jun 2008 20:54:47 +0000 (22:54 +0200)
committer Wolfgang Denk <wd@denx.de>
Wed, 11 Jun 2008 20:54:47 +0000 (22:54 +0200)
diff --cc MAINTAINERS
Simple merge
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
author	Wolfgang Denk <wd@denx.de>
	Wed, 11 Jun 2008 20:54:47 +0000 (22:54 +0200)
committer	Wolfgang Denk <wd@denx.de>
	Wed, 11 Jun 2008 20:54:47 +0000 (22:54 +0200)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
MAKEALL	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history