projects / oweals / u-boot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 399b093 89b765c)
Merge branch 'master' of git://git.denx.de/u-boot-ti
authorWolfgang Denk <wd@denx.de>
Thu, 17 Jun 2010 19:59:57 +0000 (21:59 +0200)
committerWolfgang Denk <wd@denx.de>
Thu, 17 Jun 2010 19:59:57 +0000 (21:59 +0200)
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>
1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
MAKEALL patch | diff1 | diff2 | blob | history
Makefile patch | diff1 | diff2 | blob | history

diff --cc MAINTAINERS
Simple merge
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
Unnamed repository; edit this file 'description' to name the repository.