Merge branch 'misc' of git://git.denx.de/u-boot-blackfin

author Wolfgang Denk <wd@denx.de>

Wed, 20 Apr 2011 20:57:35 +0000 (22:57 +0200)

committer Wolfgang Denk <wd@denx.de>

Wed, 20 Apr 2011 20:57:35 +0000 (22:57 +0200)
author Wolfgang Denk <wd@denx.de>
Wed, 20 Apr 2011 20:57:35 +0000 (22:57 +0200)
committer Wolfgang Denk <wd@denx.de>
Wed, 20 Apr 2011 20:57:35 +0000 (22:57 +0200)
diff --cc README
Simple merge
diff --cc common/Makefile
Simple merge
author	Wolfgang Denk <wd@denx.de>
	Wed, 20 Apr 2011 20:57:35 +0000 (22:57 +0200)
committer	Wolfgang Denk <wd@denx.de>
	Wed, 20 Apr 2011 20:57:35 +0000 (22:57 +0200)
		1	2
README	patch \|	diff1 \|	diff2 \|	blob \| history
common/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history