]> git.kernelconcepts.de Git - karo-tx-uboot.git/commit
projects / karo-tx-uboot.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2c8d419 54694a9)
Merging Stelian Pop AT91 patches
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Sat, 24 May 2008 10:56:53 +0000 (12:56 +0200)
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Sat, 24 May 2008 10:56:53 +0000 (12:56 +0200)
commit42fd5f87b1613d3039f57e93c16f760a768d3e84
tree9dd0252fca37dbdb1148ce7fd44dc5c9dd8a6b34tree | snapshot
parent2c8d41969b47eb0b973912830c58689b2ba0e50acommit | diff
parent54694a91428f6c3280fe1ee0923488a1e7e8dbc4commit | diff
Merging Stelian Pop AT91 patches

Merge branch 'testing-V2'

Conflicts:

board/atmel/at91cap9adk/Makefile
                Fixing copyright
board/atmel/at91sam9260ek/Makefile
                Fixing copyright
board/atmel/at91sam9260ek/u-boot.lds
                Delete no more needed ld script

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
CHANGELOG diff1 | diff2 | blob | history
MAINTAINERS diff1 | diff2 | blob | history
MAKEALL diff1 | diff2 | blob | history
Makefile diff1 | diff2 | blob | history
README diff1 | diff2 | blob | history
board/atmel/at91sam9260ek/at91sam9260ek.c diff1 | diff2 | blob | history
common/env_nand.c diff1 | diff2 | blob | history
drivers/net/dm9000x.c diff1 | diff2 | blob | history
drivers/video/Makefile diff1 | diff2 | blob | history
fs/jffs2/jffs2_1pass.c diff1 | diff2 | blob | history
tools/Makefile diff1 | diff2 | blob | history
UBoot for KaRo TX COM modules