From: Wolfgang Denk <wd@denx.de>
Date: Fri, 13 Jan 2012 19:05:47 +0000 (+0100)
Subject: Merge branch 'master' of /home/wd/git/u-boot/custodians
X-Git-Tag: v2012.04-rc1~318
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6d7ba2cef52d6daf119269f06c471c8882e59b84;p=oweals%2Fu-boot.git

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
---

6d7ba2cef52d6daf119269f06c471c8882e59b84