Merge branch 'master' of git://git.denx.de/u-boot-avr32 (2012-09-04 09:17:27 +0200)
are available in the git repository at:
git://www.denx.de/git/u-boot-mmc.git master
for you to fetch changes up to 95b01c47ed97a7ca8b59308e35fb8c21e8d996a5:
mmc: Remove incorrect cmd->flags usage (2012-09-06 15:23:13 -0500)
---------------------------------------------------------------- Andy Fleming (1): mmc: Remove incorrect cmd->flags usage
Benoît Thébaudeau (2): mmc_get_dev: Return error if mmc_init fails mmcinfo: Fix help message
Jaehoon Chung (3): mmc: s5p_sdhci: set the SDHCI_QUIRK_BROKEN_R1B mmc: s5p_sdhci: fixed wrong function argument mmc: s5p_sdhci: add the set_mmc_clk for cmu control
Joe Hershberger (2): mmc: Fix version check for clock API in sdhci driver mmc: Add a SDHCI quirk for boards that have no CD
Jongman Heo (1): mmc: fix wrong timeout check in mmc_send_status()
Mikhail Kshevetskiy (1): MMC: u-boot-spl may be compiled without partition support
Stephen Warren (3): mmc: detect boot sectors using EXT_CSD_BOOT_MULT too env_mmc: allow environment to be in an eMMC partition tegra: put eMMC environment into the boot sectors
Yoshihiro Shimoda (2): mmc: sh_mmcif: enable MMC_MODE_HC mmc: fix capacity calculation when EXT_CSD_SEC_CNT is used
arch/arm/include/asm/arch-exynos/mmc.h | 4 +- arch/arm/include/asm/arch-s5pc1xx/mmc.h | 4 +- common/cmd_mmc.c | 3 +- common/env_mmc.c | 64 +++++++++++++++++++++++++++---- drivers/mmc/arm_pl180_mmci.c | 2 +- drivers/mmc/mmc.c | 20 +++++----- drivers/mmc/pxa_mmc_gen.c | 8 ++-- drivers/mmc/s5p_sdhci.c | 18 ++++----- drivers/mmc/sdhci.c | 30 +++++++++++---- drivers/mmc/sh_mmcif.c | 2 +- include/configs/paz00.h | 3 +- include/configs/seaboard.h | 3 +- include/configs/trats.h | 1 + include/configs/ventana.h | 3 +- include/configs/whistler.h | 3 +- include/mmc.h | 1 + include/sdhci.h | 9 ++++- 17 files changed, 129 insertions(+), 49 deletions(-)