Merge branch 'master' of /home/wd/git/u-boot/custodians
Conflicts:
include/configs/socrates.h
Signed-off-by: NWolfgang Denk <wd@denx.de>
Showing
想要评论请 注册 或 登录
Conflicts:
include/configs/socrates.h
Signed-off-by: NWolfgang Denk <wd@denx.de>