Merge tag 'mmc-v4.0-rc4' of git://git.linaro.org/people/ulf.hansson/mmc