diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-06-17 21:59:57 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-06-17 21:59:57 +0200 |
| commit | 530135dcacac278798346ad5825c03131ce51772 (patch) | |
| tree | c99311a1ebab3dc97c30a0a92d88f9183da69ab0 /drivers | |
| parent | 399b09331f313d57b16b583f453387231d217f15 (diff) | |
| parent | 89b765c7f6ddfde07ba673dd4adbeb5da391a81b (diff) | |
| download | u-boot-imx-530135dcacac278798346ad5825c03131ce51772.zip u-boot-imx-530135dcacac278798346ad5825c03131ce51772.tar.gz u-boot-imx-530135dcacac278798346ad5825c03131ce51772.tar.bz2 | |
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>
Diffstat (limited to 'drivers')
0 files changed, 0 insertions, 0 deletions