Merge branch '080116_at91cap9' of git://linux-arm.org/u-boot-armdev
authorPeter Pearse <peter.pearse@arm.com>
Fri, 15 Feb 2008 12:59:15 +0000 (12:59 +0000)
committerPeter Pearse <peter.pearse@arm.com>
Fri, 15 Feb 2008 12:59:15 +0000 (12:59 +0000)
1  2 
MAKEALL
Makefile

diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge