[9610] serial: samsung: Fix conflict for ERD minor up
authorKyungwoo Kang <kwoo.kang@samsung.com>
Tue, 31 Jul 2018 00:04:57 +0000 (09:04 +0900)
committerJaehyoung Choi <jkkkkk.choi@samsung.com>
Tue, 31 Jul 2018 04:26:05 +0000 (13:26 +0900)
commiteedd231957703e2040dc0452428d8a019bc20e5c
treebe3b9b8debc88331304fce2c5507abc281626096
parente7bc1bc85c2f80751266cf0662475847e1cb94ae
[9610] serial: samsung: Fix conflict for ERD minor up

Change-Id: I0f77abb692169085c751e04a077b7ebbe2c343e1
Signed-off-by: Kyungwoo Kang <kwoo.kang@samsung.com>
drivers/tty/serial/samsung.c