[COMMON] storage: fix conflict during updating 4.14.113
authorYoungmin Nam <youngmin.nam@samsung.com>
Thu, 2 May 2019 06:50:31 +0000 (15:50 +0900)
committerYoungmin Nam <youngmin.nam@samsung.com>
Thu, 2 May 2019 06:50:31 +0000 (15:50 +0900)
commitea0f55b7a26d57ab32835b6ab3ca4861b8294262
treee32f4ba38e5a0335aea1bd14a631b809ec0f7cae
parentaa5fe66116d299b01a3701ace514af9e2547739e
[COMMON] storage: fix conflict during updating 4.14.113

Change-Id: I8c59808fc9d18eff9c1d89e6cd5d8a89a61ef3a2
Signed-off-by: Youngmin Nam <youngmin.nam@samsung.com>
drivers/mmc/host/dw_mmc.c
drivers/scsi/sd.c
drivers/scsi/ufs/ufshcd.c