Merge branch 'master' of git://git.denx.de/u-boot-nds32

diff --cc arch/nds32/cpu/n1213/Makefile
Simple merge

diff --cc arch/nds32/cpu/n1213/ag101/Makefile
Simple merge

diff --cc arch/nds32/cpu/n1213/ag101/lowlevel_init.S
Simple merge

diff --cc arch/nds32/cpu/n1213/ag101/timer.c
Simple merge

diff --cc arch/nds32/cpu/n1213/ag102/Makefile
Simple merge

diff --cc arch/nds32/cpu/n1213/ag102/lowlevel_init.S
Simple merge

diff --cc arch/nds32/cpu/n1213/ag102/timer.c
Simple merge

diff --cc arch/nds32/lib/Makefile
Simple merge

diff --cc board/AndesTech/adp-ag101/Makefile
Simple merge

diff --cc board/AndesTech/adp-ag101/adp-ag101.c
Simple merge

diff --cc board/AndesTech/adp-ag101p/Makefile
Simple merge

diff --cc board/AndesTech/adp-ag101p/adp-ag101p.c
Simple merge

diff --cc board/AndesTech/adp-ag102/Makefile
Simple merge

diff --cc board/AndesTech/adp-ag102/adp-ag102.c
Simple merge

diff --cc drivers/block/ftide020.c
Simple merge

diff --cc drivers/mmc/ftsdc010_mci.c
Simple merge

diff --cc drivers/pci/pci_ftpci100.c
Simple merge

diff --cc include/common.h
Simple merge

diff --cc include/configs/adp-ag101.h
Simple merge

diff --cc include/configs/adp-ag101p.h
Simple merge

diff --cc include/faraday/ftpci100.h
Simple merge

diff --cc include/ide.h
Simple merge