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

author Wolfgang Denk <wd@denx.de>

Fri, 12 Sep 2008 14:13:12 +0000 (16:13 +0200)

committer Wolfgang Denk <wd@denx.de>

Fri, 12 Sep 2008 14:13:12 +0000 (16:13 +0200)
author Wolfgang Denk <wd@denx.de>
Fri, 12 Sep 2008 14:13:12 +0000 (16:13 +0200)
committer Wolfgang Denk <wd@denx.de>
Fri, 12 Sep 2008 14:13:12 +0000 (16:13 +0200)
diff --cc Makefile
Simple merge
diff --cc board/zeus/zeus.c
Simple merge
diff --cc include/configs/imx31_litekit.h
Simple merge
diff --cc include/configs/mx31ads.h
Simple merge
diff --cc include/configs/quad100hd.h
Simple merge
diff --cc include/configs/zeus.h
Simple merge
author	Wolfgang Denk <wd@denx.de>
	Fri, 12 Sep 2008 14:13:12 +0000 (16:13 +0200)
committer	Wolfgang Denk <wd@denx.de>
	Fri, 12 Sep 2008 14:13:12 +0000 (16:13 +0200)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
board/zeus/zeus.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/imx31_litekit.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/mx31ads.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/quad100hd.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/zeus.h	patch \|	diff1 \|	diff2 \|	blob \| history