Merge branch 'u-boot-sunxi/master' into 'u-boot-arm/master'

arch/arm/cpu/armv7/sunxi/Makefile

arch/arm/cpu/armv7/sunxi/board.c

arch/arm/cpu/armv7/sunxi/clock_sun4i.c

arch/arm/cpu/armv7/sunxi/cpu_info.c

arch/arm/cpu/armv7/sunxi/dram.c

arch/arm/cpu/armv7/sunxi/u-boot-spl-fel.lds

arch/arm/cpu/armv7/sunxi/u-boot-spl.lds

arch/arm/include/asm/arch-kirkwood/config.h

arch/arm/include/asm/arch-sunxi/gpio.h

arch/arm/include/asm/arch-sunxi/i2c.h

arch/arm/include/asm/arch-sunxi/timer.h

board/sunxi/Makefile

board/sunxi/board.c

board/sunxi/dram_a13_oli_micro.c

board/sunxi/dram_cubieboard.c

board/sunxi/dram_cubieboard2.c

board/sunxi/dram_r7dongle.c

board/sunxi/gmac.c

boards.cfg

drivers/gpio/Makefile