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