Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master
Conflicts:
drivers/rtc/Makefile
Signed-off-by: NWolfgang Denk <wd@denx.de>
Showing
drivers/rtc/isl1208.c
0 → 100644
想要评论请 注册 或 登录
Conflicts:
drivers/rtc/Makefile
Signed-off-by: NWolfgang Denk <wd@denx.de>