Android SDK
  1. Android SDK

uboot-imx

Public

Commits

Wolfgang Denk
399b09331f3 + 89b765c7f6d
Wolfgang Denk committed 530135dcacaM
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 89b765c7f6ddfde07ba673dd4adbeb5da391a81b.
	board/ti/tnetv107xevm/Makefile added in HEAD
But files were identical, so no problem.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Showing diff to89b765c7f6d