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

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



Conflicts:

	Makefile

Signed-off-by: default avatarWolfgang Denk <wd@denx.de>
parents 4d2ae70e 5ff88934
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