From: Wolfgang Denk <wd@denx.de>
Date: Thu, 17 Jun 2010 19:59:57 +0000 (+0200)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-ti
X-Git-Tag: v2010.06-rc3~15
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=530135dcacac278798346ad5825c03131ce51772;p=u-boot

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>
---

530135dcacac278798346ad5825c03131ce51772