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

arch/arm/Kconfig

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

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

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

arch/arm/mach-sunxi/Kconfig

arch/arm/mach-sunxi/board.c

arch/arm/mach-sunxi/clock_sun6i.c

board/sunxi/MAINTAINERS

board/sunxi/board.c

configs/Bananapi_M2_Ultra_defconfig

configs/Sinovoip_BPI_M2_Plus_defconfig

configs/nanopi_neo_air_defconfig

configs/nanopi_neo_defconfig

configs/orangepi_zero_defconfig

drivers/i2c/mvtwsi.c

drivers/power/sy8106a.c

drivers/video/sunxi/Makefile

drivers/video/sunxi/sunxi_de2.c

drivers/video/sunxi/sunxi_dw_hdmi.c

include/configs/sunxi-common.h