Merge branch 'omap-fixes'

Conflicts:
	arch/arm/mach-omap2/board-h4.c
	arch/arm/mach-omap2/board-rx51.c
	drivers/mmc/host/omap_hsmmc.c

diff --combined drivers/mmc/host/omap_hsmmc.c
index 63a06266828edb21fda7fefe8172b704bcb1a236,a752788fa4e97df1e192f21c9ff0d3db46109dee..84554db12e73d3a3a4b9ff19a1f8aa6ccd030418
--- 1/drivers/mmc/host/omap_hsmmc.c
--- 2/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@@ -434,6 -434,8 +434,8 @@@ static irqreturn_t mmc_omap_irq(int irq
        if (host->mrq == NULL) {
                OMAP_HSMMC_WRITE(host->base, STAT,
                        OMAP_HSMMC_READ(host->base, STAT));
+               /* Flush posted write */
+               OMAP_HSMMC_READ(host->base, STAT);
                return IRQ_HANDLED;
        }
  
@@@ -489,7 -491,8 +491,8 @@@
        }
  
        OMAP_HSMMC_WRITE(host->base, STAT, status);
-       OMAP_HSMMC_READ(host->base, STAT); /* flush posted write */
+       /* Flush posted write */
+       OMAP_HSMMC_READ(host->base, STAT);
  
        if (end_cmd || (status & CC))
                mmc_omap_cmd_done(host, host->cmd);
@@@ -1071,6 -1074,7 +1074,6 @@@ static int __init omap_mmc_probe(struc
        mmc->max_req_size = mmc->max_blk_size * mmc->max_blk_count;
        mmc->max_seg_size = mmc->max_req_size;
  
 -      mmc->ocr_avail = mmc_slot(host).ocr_mask;
        mmc->caps |= MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED;
  
        if (pdata->slots[host->slot_id].wires >= 8)
@@@ -1107,14 -1111,13 +1110,14 @@@
                goto err_irq;
        }
  
 +      /* initialize power supplies, gpios, etc */
        if (pdata->init != NULL) {
                if (pdata->init(&pdev->dev) != 0) {
 -                      dev_dbg(mmc_dev(host->mmc),
 -                              "Unable to configure MMC IRQs\n");
 +                      dev_dbg(mmc_dev(host->mmc), "late init error\n");
                        goto err_irq_cd_init;
                }
        }
 +      mmc->ocr_avail = mmc_slot(host).ocr_mask;
  
        /* Request IRQ for card detect */
        if ((mmc_slot(host).card_detect_irq)) {