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

diff --combined scripts/config_whitelist.txt
index 6be74e6,2d77ff8..2dacf79
--- 1/scripts/config_whitelist.txt
--- 2/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@@ -157,9 -157,6 +157,6 @@@ CONFIG_BCH_CONST_PARAM
  CONFIG_BCH_CONST_T
  CONFIG_BCM2835_GPIO
  CONFIG_BCM283X_MU_SERIAL
- CONFIG_BCM_SF2_ETH
- CONFIG_BCM_SF2_ETH_DEFAULT_PORT
- CONFIG_BCM_SF2_ETH_GMAC
  CONFIG_BIOSEMU
  CONFIG_BITBANGMII_MULTI
  CONFIG_BL1_OFFSET
@@@ -5204,6 -5201,7 +5201,6 @@@ CONFIG_VIDEO_MX
  CONFIG_VIDEO_MXS_MODE_SYSTEM
  CONFIG_VIDEO_OMAP3
  CONFIG_VIDEO_ONBOARD
 -CONFIG_VIDEO_SM501_PCI
  CONFIG_VIDEO_STD_TIMINGS
  CONFIG_VIDEO_SUNXI
  CONFIG_VIDEO_VCXK