tty: serial: samsung: fix conflict during updating 4.14.113
authorYoungmin Nam <youngmin.nam@samsung.com>
Thu, 2 May 2019 07:38:22 +0000 (16:38 +0900)
committerYoungmin Nam <youngmin.nam@samsung.com>
Fri, 3 May 2019 04:54:26 +0000 (13:54 +0900)
commitf04738e73d48993ebbdefcc259967be9a704f38b
treea5172a06c226b762e1fec316e77ab4c894b5c1ad
parent32db8e6e8020d1d9794ccfb1aec754d280523a36
tty: serial: samsung: fix conflict during updating 4.14.113

Change-Id: If2084faf3153b6060f1579d077f13221b0b6f391
Signed-off-by: Youngmin Nam <youngmin.nam@samsung.com>
drivers/tty/serial/samsung.c