Merge branch 'master' of git://git.denx.de/u-boot-arm

author Wolfgang Denk <wd@denx.de>

Wed, 27 Apr 2011 19:48:09 +0000 (21:48 +0200)

committer Wolfgang Denk <wd@denx.de>

Wed, 27 Apr 2011 19:48:09 +0000 (21:48 +0200)
author Wolfgang Denk <wd@denx.de>
Wed, 27 Apr 2011 19:48:09 +0000 (21:48 +0200)
committer Wolfgang Denk <wd@denx.de>
Wed, 27 Apr 2011 19:48:09 +0000 (21:48 +0200)
diff --cc README
Simple merge
diff --cc include/configs/omap3_beagle.h
Simple merge
author	Wolfgang Denk <wd@denx.de>
	Wed, 27 Apr 2011 19:48:09 +0000 (21:48 +0200)
committer	Wolfgang Denk <wd@denx.de>
	Wed, 27 Apr 2011 19:48:09 +0000 (21:48 +0200)
		1	2
README	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/omap3_beagle.h	patch \|	diff1 \|	diff2 \|	blob \| history