clocksource/drivers/exynos_mct: fix conflict during updating 4.14.113
authorYoungmin Nam <youngmin.nam@samsung.com>
Thu, 2 May 2019 07:21:28 +0000 (16:21 +0900)
committerYoungmin Nam <youngmin.nam@samsung.com>
Thu, 2 May 2019 07:21:28 +0000 (16:21 +0900)
commit07ff55e71694d4605bc19fd2f886b31f47cd96f0
treed0e2d1adf56666b290a89bfc504090311f483448
parent1a0339622c26c6b5fb5d2c312412905246723aea
clocksource/drivers/exynos_mct: fix conflict during updating 4.14.113

Change-Id: I9c7b2d3240fae816785ee026628a63bc94e6ac42
Signed-off-by: Youngmin Nam <youngmin.nam@samsung.com>
drivers/clocksource/exynos_mct.c