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

- Add #undef CONFIG_DM_MMC_OPS to omap3_logic in the SPL build case, to
  match other TI platforms in the same situation.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --cc board/compulab/cm_t54/cm_t54.c
Simple merge

diff --cc board/gumstix/duovero/duovero.c
Simple merge

diff --cc board/overo/overo.c
Simple merge

diff --cc board/quipos/cairo/cairo.c
Simple merge

diff --cc board/technexion/tao3530/tao3530.c
Simple merge

diff --cc board/ti/beagle/beagle.c
Simple merge

diff --cc board/ti/omap5_uevm/evm.c
Simple merge

diff --cc board/ti/panda/panda.c
Simple merge

diff --cc common/board_r.c
Simple merge

diff --cc common/spl/Kconfig
Simple merge

diff --cc include/configs/omap3_logic.h
index 735c9ef08ab3b9a6de2d9270bd96417a491de4f3,772fc60c9c3e17422202d8ec98b2622cbe7be0fc..f8978037f2ba9ba8cf7b74891958c4227bcea3a2
--- 1/include/configs/omap3_logic.h
--- 2/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@@ -23,6 -23,6 +23,7 @@@
   * DM support in SPL
   */
  #undef CONFIG_DM_MMC
++#undef CONFIG_DM_MMC_OPS
  #undef OMAP_HSMMC_USE_GPIO
  
  /* select serial console configuration for SPL */