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

diff --combined drivers/video/Kconfig
index 1dc082a7a53deda6f38a7ec681cb814b667429c6,955b0b7460b26db89e1243aa01906da249c34bec..caf1efcbb3377b087c7fd5560ca5fa888590af9a
--- 1/drivers/video/Kconfig
--- 2/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@@ -44,7 -44,7 +44,7 @@@ config FRAMEBUFFER_VESA_MODE_10
        bool "1024x768 16-color"
  
  config FRAMEBUFFER_VESA_MODE_105
-       bool "1024x7686 256-color"
+       bool "1024x768 256-color"
  
  config FRAMEBUFFER_VESA_MODE_106
        bool "1280x1024 16-color"
@@@ -151,14 -151,6 +151,14 @@@ config FRAMEBUFFER_VESA_MOD
        default 0x11B if FRAMEBUFFER_VESA_MODE_11B
        default 0x117 if FRAMEBUFFER_VESA_MODE_USER
  
 +config VIDEO_LCD_ANX9804
 +      bool "ANX9804 bridge chip"
 +      default n
 +      ---help---
 +      Support for the ANX9804 bridge chip, which can take pixel data coming
 +      from a parallel LCD interface and translate it on the fy into a DP
 +      interface for driving eDP TFT displays. It uses I2C for configuration.
 +
  config VIDEO_LCD_SSD2828
        bool "SSD2828 bridge chip"
        default n