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

author Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>

Fri, 18 Jan 2008 13:48:06 +0000 (22:48 +0900)

committer Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>

Fri, 18 Jan 2008 13:48:06 +0000 (22:48 +0900)
author Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
Fri, 18 Jan 2008 13:48:06 +0000 (22:48 +0900)
committer Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
Fri, 18 Jan 2008 13:48:06 +0000 (22:48 +0900)
diff --cc MAINTAINERS
Simple merge
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
author	Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
	Fri, 18 Jan 2008 13:48:06 +0000 (22:48 +0900)
committer	Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
	Fri, 18 Jan 2008 13:48:06 +0000 (22:48 +0900)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
MAKEALL	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history