tree 1407b62f99fa0b016d544b112a79cf6b3c5bc574
parent dcf6fd7a00e32e98734f0f3ec7eb87f87f08aece
parent 67a8bd8c539874c364635a232674f2f9adec2380
author Wolfgang Denk <wd@denx.de> 1311107227 +0200
committer Wolfgang Denk <wd@denx.de> 1311107227 +0200

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

* 'master' of git://git.denx.de/u-boot-mmc:
  mmc: rescan fails on empty slot
  AT91:mmc:fix multiple read/write error
  mmc: Access mode validation for eMMC cards > 2 GiB
  mmc: sh_mmcif: add support for Renesas MMCIF
  mmc: fix the condition for MMC version 4
  MMC: add marvell sdhci driver
  MMC: add sdhci generic framework
  MMC: add erase function to both mmc and sd
  MMC: unify mmc read and write operation
  mmc: Tegra2: Enable SD/MMC driver for Seaboard and Harmony
  mmc: Tegra2: SD/MMC driver for Seaboard - eMMC on SDMMC4, SDIO on SDMMC3