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

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

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

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

common/edid.c

common/lcd.c

drivers/video/Kconfig

drivers/video/Makefile

drivers/video/dw_hdmi.c

drivers/video/rockchip/Kconfig

drivers/video/rockchip/Makefile

drivers/video/sunxi/Makefile

drivers/video/sunxi/sunxi_display.c

drivers/video/sunxi/tve.c

drivers/video/video_bmp.c

include/configs/brxre1.h

include/edid.h

include/fdtdec.h

scripts/config_whitelist.txt