Merge branch 'master' of /home/wd/git/u-boot/custodians
authorWolfgang Denk <wd@denx.de>
Fri, 13 Jan 2012 19:05:47 +0000 (20:05 +0100)
committerWolfgang Denk <wd@denx.de>
Fri, 13 Jan 2012 19:05:47 +0000 (20:05 +0100)
commit6d7ba2cef52d6daf119269f06c471c8882e59b84
tree94251571a5c2f6fdff10968ad6d76a2eb3ecc763
parentd0b8feef8b50335a58ffde7df3e6748adfaa7025
parent8eee2bd7f484c4933c4e3112c3c3db886ac945ca
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