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

arch/arm/mach-mvebu/include/mach/cpu.h

arch/arm/mach-mvebu/include/mach/soc.h

common/lcd.c

configs/chromebook_jerry_defconfig

configs/firefly-rk3288_defconfig

configs/nyan-big_defconfig

configs/rock2_defconfig

drivers/video/Kconfig

drivers/video/Makefile

drivers/video/mvebu_lcd.c

include/configs/chromebook_jerry.h

include/configs/firefly-rk3288.h

include/configs/nyan-big.h

include/configs/rock2.h

include/lcd.h