Merge with /home/tur/proj/051_uboot_linux_v38b/u-boot

author Wolfgang Denk <wd@pollux.denx.de>

Wed, 18 Oct 2006 20:27:57 +0000 (22:27 +0200)

committer Wolfgang Denk <wd@pollux.denx.de>

Wed, 18 Oct 2006 20:27:57 +0000 (22:27 +0200)
author Wolfgang Denk <wd@pollux.denx.de>
Wed, 18 Oct 2006 20:27:57 +0000 (22:27 +0200)
committer Wolfgang Denk <wd@pollux.denx.de>
Wed, 18 Oct 2006 20:27:57 +0000 (22:27 +0200)
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
diff --cc include/common.h
Simple merge
author	Wolfgang Denk <wd@pollux.denx.de>
	Wed, 18 Oct 2006 20:27:57 +0000 (22:27 +0200)
committer	Wolfgang Denk <wd@pollux.denx.de>
	Wed, 18 Oct 2006 20:27:57 +0000 (22:27 +0200)
		1	2
MAKEALL	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
include/common.h	patch \|	diff1 \|	diff2 \|	blob \| history