Merge git://git.denx.de/u-boot-x86

diff --cc drivers/video/Makefile
index 7301be3,000f389..00b563f
--- 1/drivers/video/Makefile
--- 2/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@@ -39,9 -39,9 +39,10 @@@ obj-$(CONFIG_VIDEO_SANDBOX_SDL) += sand
  obj-$(CONFIG_VIDEO_SED13806) += sed13806.o
  obj-$(CONFIG_VIDEO_SM501) += sm501.o
  obj-$(CONFIG_VIDEO_SMI_LYNXEM) += smiLynxEM.o videomodes.o
 +obj-$(CONFIG_VIDEO_SUNXI) += sunxi_display.o
  obj-$(CONFIG_VIDEO_TEGRA) += tegra.o
  obj-$(CONFIG_VIDEO_VCXK) += bus_vcxk.o
+ obj-$(CONFIG_VIDEO_X86) += x86_fb.o
  obj-$(CONFIG_FORMIKE) += formike.o
  obj-$(CONFIG_AM335X_LCD) += am335x-fb.o
  obj-$(CONFIG_VIDEO_PARADE) += parade.o

diff --cc include/fdtdec.h
Simple merge

diff --cc lib/fdtdec.c
Simple merge