Merge branch 'master' of http://www.denx.de/git/u-boot
authorJon Loeliger <jdl@freescale.com>
Tue, 22 Aug 2006 15:17:59 +0000 (10:17 -0500)
committerJon Loeliger <jdl@freescale.com>
Tue, 22 Aug 2006 15:17:59 +0000 (10:17 -0500)
1  2 
Makefile
include/common.h

diff --cc Makefile
Simple merge
Simple merge