[COMMON] mmc: dw_mmc: Fix minor version merge conflict
authorJaeHun Jung <jh0801.jung@samsung.com>
Mon, 30 Jul 2018 11:26:08 +0000 (20:26 +0900)
committerJaehyoung Choi <jkkkkk.choi@samsung.com>
Tue, 31 Jul 2018 04:26:06 +0000 (13:26 +0900)
commit7ba229b743b3dc308d23e429c20e35b12b06073c
tree650e777567d9d9f7601662e709d3f8330ace2eba
parenteedd231957703e2040dc0452428d8a019bc20e5c
[COMMON] mmc: dw_mmc: Fix minor version merge conflict

Change-Id: I7821c349ada1c4e516de0217004e98f45890cd01
Signed-off-by: JaeHun Jung <jh0801.jung@samsung.com>
drivers/mmc/host/dw_mmc.c