]> git.dujemihanovic.xyz Git - u-boot.git/commit
projects / u-boot.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit530135dcacac278798346ad5825c03131ce51772
treec99311a1ebab3dc97c30a0a92d88f9183da69ab0tree | snapshot
parent399b09331f313d57b16b583f453387231d217f15commit | diff
parent89b765c7f6ddfde07ba673dd4adbeb5da391a81bcommit | diff
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>
MAINTAINERS diff1 | diff2 | blob | history
MAKEALL diff1 | diff2 | blob | history
Makefile diff1 | diff2 | blob | history
My U-Boot fork