Merge with /home/hs/TQ/u-boot-dev

author Wolfgang Denk <wd@denx.de>

Sun, 24 Dec 2006 00:30:04 +0000 (01:30 +0100)

committer Wolfgang Denk <wd@denx.de>

Sun, 24 Dec 2006 00:30:04 +0000 (01:30 +0100)
author Wolfgang Denk <wd@denx.de>
Sun, 24 Dec 2006 00:30:04 +0000 (01:30 +0100)
committer Wolfgang Denk <wd@denx.de>
Sun, 24 Dec 2006 00:30:04 +0000 (01:30 +0100)
diff --cc Makefile
Simple merge
diff --cc lib_ppc/board.c
Simple merge
author	Wolfgang Denk <wd@denx.de>
	Sun, 24 Dec 2006 00:30:04 +0000 (01:30 +0100)
committer	Wolfgang Denk <wd@denx.de>
	Sun, 24 Dec 2006 00:30:04 +0000 (01:30 +0100)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
lib_ppc/board.c	patch \|	diff1 \|	diff2 \|	blob \| history