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

arch/arm/cpu/armv7/sunxi/Makefile

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

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

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

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

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

arch/arm/cpu/armv7/sunxi/psci.S

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

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

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

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

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

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

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

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

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

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

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

board/sunxi/Kconfig

board/sunxi/MAINTAINERS