printk: fix conflict during updating 4.14.113
authorYoungmin Nam <youngmin.nam@samsung.com>
Thu, 2 May 2019 07:35:15 +0000 (16:35 +0900)
committerYoungmin Nam <youngmin.nam@samsung.com>
Fri, 3 May 2019 04:54:26 +0000 (13:54 +0900)
commit0857c25fd6bf58c8ace8916a214280fdb772d577
treeb4a4254e8bebd41d642b09afa77af50891999cb4
parent23d5fec7fa9f87ab97dbf435d91dafe98b04ad08
printk: fix conflict during updating 4.14.113

Change-Id: Icf1b8cad7e1f29f02c4cf16638a1792b9fc9f55e
Signed-off-by: Youngmin Nam <youngmin.nam@samsung.com>
kernel/printk/printk.c