Merge branch 'master_merge_new-image' of /home/tur/git/u-boot

author Wolfgang Denk <wd@denx.de>

Wed, 26 Mar 2008 09:41:48 +0000 (10:41 +0100)

committer Wolfgang Denk <wd@denx.de>

Wed, 26 Mar 2008 09:41:48 +0000 (10:41 +0100)
author Wolfgang Denk <wd@denx.de>
Wed, 26 Mar 2008 09:41:48 +0000 (10:41 +0100)
committer Wolfgang Denk <wd@denx.de>
Wed, 26 Mar 2008 09:41:48 +0000 (10:41 +0100)
diff --cc README
Simple merge
diff --cc common/cmd_usb.c
Simple merge
author	Wolfgang Denk <wd@denx.de>
	Wed, 26 Mar 2008 09:41:48 +0000 (10:41 +0100)
committer	Wolfgang Denk <wd@denx.de>
	Wed, 26 Mar 2008 09:41:48 +0000 (10:41 +0100)
		1	2
README	patch \|	diff1 \|	diff2 \|	blob \| history
common/cmd_usb.c	patch \|	diff1 \|	diff2 \|	blob \| history