Merge branch 'Makefile' of git://git.denx.de/u-boot-arm
authorWolfgang Denk <wd@denx.de>
Wed, 13 Aug 2008 21:23:13 +0000 (23:23 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 13 Aug 2008 21:23:13 +0000 (23:23 +0200)
1  2 
Makefile
include/configs/katmai.h
include/configs/kilauea.h
include/configs/makalu.h

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