Merging
#modified:   arch/arm/boot/compressed/Makefile

Signed-off-by: cholokei <leesl0416@naver.com>
mmc: Merging
#modified:   drivers/mmc/core/core.c

Signed-off-by: cholokei <leesl0416@naver.com>