Merge branch 'master' of /home/wd/git/u-boot/custodians

author Wolfgang Denk <wd@denx.de>

Mon, 13 Jul 2009 21:37:59 +0000 (23:37 +0200)

committer Wolfgang Denk <wd@denx.de>

Mon, 13 Jul 2009 21:37:59 +0000 (23:37 +0200)
author Wolfgang Denk <wd@denx.de>
Mon, 13 Jul 2009 21:37:59 +0000 (23:37 +0200)
committer Wolfgang Denk <wd@denx.de>
Mon, 13 Jul 2009 21:37:59 +0000 (23:37 +0200)
diff --cc Makefile
Simple merge
diff --cc include/configs/r2dplus.h
Simple merge
author	Wolfgang Denk <wd@denx.de>
	Mon, 13 Jul 2009 21:37:59 +0000 (23:37 +0200)
committer	Wolfgang Denk <wd@denx.de>
	Mon, 13 Jul 2009 21:37:59 +0000 (23:37 +0200)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/r2dplus.h	patch \|	diff1 \|	diff2 \|	blob \| history