Merge with http://opensource.freescale.com/pub/scm/u-boot-85xx.git#for_wd

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

Wed, 11 Oct 2006 21:54:37 +0000 (23:54 +0200)

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

Wed, 11 Oct 2006 21:54:37 +0000 (23:54 +0200)
author Wolfgang Denk <wd@pollux.denx.de>
Wed, 11 Oct 2006 21:54:37 +0000 (23:54 +0200)
committer Wolfgang Denk <wd@pollux.denx.de>
Wed, 11 Oct 2006 21:54:37 +0000 (23:54 +0200)
diff --cc board/tqm85xx/tqm85xx.c
Simple merge
diff --cc common/cmd_bootm.c
Simple merge
diff --cc common/ft_build.c
Simple merge
author	Wolfgang Denk <wd@pollux.denx.de>
	Wed, 11 Oct 2006 21:54:37 +0000 (23:54 +0200)
committer	Wolfgang Denk <wd@pollux.denx.de>
	Wed, 11 Oct 2006 21:54:37 +0000 (23:54 +0200)
		1	2
board/tqm85xx/tqm85xx.c	patch \|	diff1 \|	diff2 \|	blob \| history
common/cmd_bootm.c	patch \|	diff1 \|	diff2 \|	blob \| history
common/ft_build.c	patch \|	diff1 \|	diff2 \|	blob \| history