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

diff --combined configs/omap3_logic_defconfig
index 7479c5253f04cafee4c8a902589a767312e6c6d7,37ee2670372155cb419f857564d754c16ee6c89a..fe762c0a6b04c01ec34d0e148bfdad56b18a52e3
--- 1/configs/omap3_logic_defconfig
--- 2/configs/omap3_logic_defconfig
+++ b/configs/omap3_logic_defconfig
@@@ -5,7 -5,6 +5,7 @@@ CONFIG_SYS_EXTRA_OPTIONS="NAND
  CONFIG_SYS_CONSOLE_INFO_QUIET=y
  CONFIG_VERSION_VARIABLE=y
  CONFIG_SPL=y
 +CONFIG_SPL_SYS_MALLOC_SIMPLE=y
  CONFIG_SPL_MTD_SUPPORT=y
  CONFIG_SPL_OS_BOOT=y
  CONFIG_HUSH_PARSER=y
@@@ -34,6 -33,7 +34,7 @@@ CONFIG_CMD_UBI=
  CONFIG_ISO_PARTITION=y
  CONFIG_EFI_PARTITION=y
  CONFIG_MMC_OMAP_HS=y
+ CONFIG_MMC_OMAP36XX_PINS=y
  CONFIG_SYS_NS16550=y
  CONFIG_USB=y
  CONFIG_USB_MUSB_GADGET=y