Merge branch '080116_at91cap9' of git://linux-arm.org/u-boot-armdev

author Peter Pearse <peter.pearse@arm.com>

Fri, 15 Feb 2008 12:59:15 +0000 (12:59 +0000)

committer Peter Pearse <peter.pearse@arm.com>

Fri, 15 Feb 2008 12:59:15 +0000 (12:59 +0000)
author Peter Pearse <peter.pearse@arm.com>
Fri, 15 Feb 2008 12:59:15 +0000 (12:59 +0000)
committer Peter Pearse <peter.pearse@arm.com>
Fri, 15 Feb 2008 12:59:15 +0000 (12:59 +0000)
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
author	Peter Pearse <peter.pearse@arm.com>
	Fri, 15 Feb 2008 12:59:15 +0000 (12:59 +0000)
committer	Peter Pearse <peter.pearse@arm.com>
	Fri, 15 Feb 2008 12:59:15 +0000 (12:59 +0000)
		1	2
MAKEALL	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history