Merge branch 'master' of git://git.denx.de/u-boot-ti
Conflicts: CONFLICT (rename/add): Rename board/davinci/da830evm/Makefile->board/ti/tnetv107xevm/Makefile in 89b765c7. board/ti/tnetv107xevm/Makefile added in HEAD But files were identical, so no problem. Signed-off-by: NWolfgang Denk <wd@denx.de>
Showing
board/davinci/da8xxevm/common.c
0 → 100644
board/davinci/da8xxevm/common.h
0 → 100644
board/davinci/da8xxevm/da850evm.c
0 → 100644
include/configs/da850evm.h
0 → 100644
想要评论请 注册 或 登录