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

author Minkyu Kang <mk7.kang@samsung.com>

Mon, 12 Oct 2009 05:40:42 +0000 (14:40 +0900)

committer Minkyu Kang <mk7.kang@samsung.com>

Mon, 12 Oct 2009 05:40:42 +0000 (14:40 +0900)
author Minkyu Kang <mk7.kang@samsung.com>
Mon, 12 Oct 2009 05:40:42 +0000 (14:40 +0900)
committer Minkyu Kang <mk7.kang@samsung.com>
Mon, 12 Oct 2009 05:40:42 +0000 (14:40 +0900)
diff --cc MAINTAINERS
Simple merge
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
author	Minkyu Kang <mk7.kang@samsung.com>
	Mon, 12 Oct 2009 05:40:42 +0000 (14:40 +0900)
committer	Minkyu Kang <mk7.kang@samsung.com>
	Mon, 12 Oct 2009 05:40:42 +0000 (14:40 +0900)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
MAKEALL	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history