tree 1eaaa31eb768d8bfa68e9ff41eef53d37b64f21c
parent f6921e3dc331293c873ec4d109fd5517a42a90b3
parent 30942b18b66f35f2ceedab39af10e9eccaa943cc
author Wolfgang Denk <wd@denx.de> 1203030378 +0100
committer Wolfgang Denk <wd@denx.de> 1203030378 +0100

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

Conflicts:

	Makefile
	doc/README.standalone

Signed-off-by: Wolfgang Denk <wd@denx.de>