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

Merge branch 'master' of /home/wd/git/u-boot/custodians 



Conflicts:

	include/configs/socrates.h

Signed-off-by: default avatarWolfgang Denk <wd@denx.de>
parents 791e1dba c918261c
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