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

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

arch/arm/dts/Makefile

arch/arm/dts/sun50i-a64-orangepi-win.dts

arch/arm/dts/sun50i-h5-nanopi-neo2.dts

arch/arm/dts/sun50i-h5-orangepi-zero-plus2.dts

arch/arm/dts/sun8i-h3-nanopi-m1-plus.dts

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

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

arch/arm/mach-sunxi/Kconfig

arch/arm/mach-sunxi/Makefile

arch/arm/mach-sunxi/dram_sunxi_dw.c

arch/arm/mach-sunxi/dram_timings/Makefile

arch/arm/mach-sunxi/dram_timings/ddr2_v3s.c

arch/arm/mach-sunxi/dram_timings/ddr3_1333.c

arch/arm/mach-sunxi/dram_timings/lpddr3_stock.c

board/sunxi/MAINTAINERS

configs/nanopi_m1_plus_defconfig

configs/nanopi_neo2_defconfig

configs/orangepi_win_defconfig

configs/orangepi_zero_plus2_defconfig