tree 94251571a5c2f6fdff10968ad6d76a2eb3ecc763
parent bcbd5219d9c50a5fe2394f5eec7638497800a1b8
parent 66a722ef1bfeda7bc301328ad230c6c4b209aac3
author Wolfgang Denk <wd@denx.de> 1326481547 +0100
committer Wolfgang Denk <wd@denx.de> 1326481547 +0100

Merge branch 'master' of /home/wd/git/u-boot/custodians

* 'master' of /home/wd/git/u-boot/custodians:
  fsl_esdhc: fix PIO mode transfers
  mmc: tegra2: Implement card-detect hook.
  mmc: fsl_esdhc: Implement card-detect hook.
  mmc: Implement card detection.
  mmc: Change board_mmc_getcd() function prototype.
  drivers/mmc/mv_sdhci.c: Fix build warning
  ftsdc010: improve performance and capability
  mmc: add host_caps checking avoid switch card improperly
  i.mx: fsl_esdhc: add the i.mx6q support