Merge branch 'master' of git://git.denx.de/u-boot-nds32
authorTom Rini <trini@ti.com>
Thu, 25 Jul 2013 12:22:08 +0000 (08:22 -0400)
committerTom Rini <trini@ti.com>
Thu, 25 Jul 2013 12:51:51 +0000 (08:51 -0400)
commitaaf5e825606a70ddc8fca8e366d8c16a6fd3cc7c
tree64eaea4d396dce4e0a30bb955b8240d4b199cdca
parent0b17998e509e5614633aee0a3c5d6248f8bc580b
parentc54fd3efa497876a33cc3c6e7df514ae53abc729
Merge branch 'master' of git://git.denx.de/u-boot-nds32
22 files changed:
arch/nds32/cpu/n1213/Makefile
arch/nds32/cpu/n1213/ag101/Makefile
arch/nds32/cpu/n1213/ag101/lowlevel_init.S
arch/nds32/cpu/n1213/ag101/timer.c
arch/nds32/cpu/n1213/ag102/Makefile
arch/nds32/cpu/n1213/ag102/lowlevel_init.S
arch/nds32/cpu/n1213/ag102/timer.c
arch/nds32/lib/Makefile
board/AndesTech/adp-ag101/Makefile
board/AndesTech/adp-ag101/adp-ag101.c
board/AndesTech/adp-ag101p/Makefile
board/AndesTech/adp-ag101p/adp-ag101p.c
board/AndesTech/adp-ag102/Makefile
board/AndesTech/adp-ag102/adp-ag102.c
drivers/block/ftide020.c
drivers/mmc/ftsdc010_mci.c
drivers/pci/pci_ftpci100.c
include/common.h
include/configs/adp-ag101.h
include/configs/adp-ag101p.h
include/faraday/ftpci100.h
include/ide.h