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

author Wolfgang Denk <wd@denx.de>

Wed, 13 Aug 2008 21:23:13 +0000 (23:23 +0200)

committer Wolfgang Denk <wd@denx.de>

Wed, 13 Aug 2008 21:23:13 +0000 (23:23 +0200)
author Wolfgang Denk <wd@denx.de>
Wed, 13 Aug 2008 21:23:13 +0000 (23:23 +0200)
committer Wolfgang Denk <wd@denx.de>
Wed, 13 Aug 2008 21:23:13 +0000 (23:23 +0200)
diff --cc Makefile
Simple merge
diff --cc include/configs/katmai.h
Simple merge
diff --cc include/configs/kilauea.h
Simple merge
diff --cc include/configs/makalu.h
Simple merge
author	Wolfgang Denk <wd@denx.de>
	Wed, 13 Aug 2008 21:23:13 +0000 (23:23 +0200)
committer	Wolfgang Denk <wd@denx.de>
	Wed, 13 Aug 2008 21:23:13 +0000 (23:23 +0200)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/katmai.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/kilauea.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/makalu.h	patch \|	diff1 \|	diff2 \|	blob \| history