Skip to content
Commit 6f99eec3 authored by Wolfgang Denk's avatar Wolfgang Denk
Browse files

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



Conflicts:

	Makefile
	doc/README.standalone

Signed-off-by: default avatarWolfgang Denk <wd@denx.de>
parents f6921e3d 30942b18
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment