Learn more about cloning repositories
You have read-only access
Merge branch 'master' of /home/wd/git/u-boot/custodians Conflicts: include/configs/socrates.h Signed-off-by: Wolfgang Denk <wd@denx.de>
