Merge tag 'mmc-v3.19-4' of git://git.linaro.org/people/ulf.hansson/mmc