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

diff --combined drivers/video/Makefile
index 0914ea173d8a5fd41cf844ffa587d58e7d4fa5b9,248aa350b7eb0258731bf0408aa0b3bcae760b04..14a6781edca17c9bd830c6b714a081b133030d80
--- 1/drivers/video/Makefile
--- 2/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@@ -15,7 -15,6 +15,7 @@@ obj-$(CONFIG_EXYNOS_MIPI_DSIM) += exyno
                                exynos_mipi_dsi_lowlevel.o
  obj-$(CONFIG_EXYNOS_PWM_BL) += exynos_pwm_bl.o
  obj-$(CONFIG_FSL_DIU_FB) += fsl_diu_fb.o videomodes.o
 +obj-$(CONFIG_FSL_DCU_FB) += fsl_dcu_fb.o videomodes.o
  obj-$(CONFIG_L5F31188) += l5f31188.o
  obj-$(CONFIG_MPC8XX_LCD) += mpc8xx_lcd.o
  obj-$(CONFIG_PXA_LCD) += pxa_lcd.o
@@@ -43,3 -42,4 +43,4 @@@ obj-$(CONFIG_VIDEO_TEGRA) += tegra.
  obj-$(CONFIG_VIDEO_VCXK) += bus_vcxk.o
  obj-$(CONFIG_FORMIKE) += formike.o
  obj-$(CONFIG_AM335X_LCD) += am335x-fb.o
+ obj-$(CONFIG_VIDEO_PARADE) += parade.o