Merge changes I7fdde988,I982dd4c4 into msm-3.4

* changes:
  mmc: msm_sdcc: add warning if data timeout is zero
  mmc: block: fix data timeout issue with ACMD22