tree 3ce9b22609e6c1d3e140fd2fb96af0c26efa948d
parent f50bf50d7f6f99c5ad4666d63a7eef43d3940500
parent 7d2d58b4e63a8307f713e6b17fdb9b2413548574
author Wolfgang Denk <wd@denx.de> 1337541650 +0200
committer Wolfgang Denk <wd@denx.de> 1337541650 +0200

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

* 'master' of git://git.denx.de/u-boot-mmc:
  ARM: SAMSUNG: support sdhci controller
  mmc: support the sdhci instead of s5p_mmc for samsung-soc
  mmc: add the quirk to use the sdhci for samsung-soc
  mmc: sdhci: add the quirk for broken r1b response
  i.MX28: Lower the amount of blocks transfered in one DMA cycle
  mmc: fsl_esdhc: Poll until card is not busy anymore
  include/mmc.h: remove struct mmc_csd
  mmc: omap: handle controller errors properly
  mmc: omap: improve stat wait message
  mmc: omap: follow TRM procedure to power on cards
  mmc:fix: Set mmc width according to MMC host capabilities