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