-
git://git.denx.de/u-boot-ti由 Wolfgang Denk 提交于
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>
530135dc