videobuf2: fix conflict during updating 4.14.113
authorYoungmin Nam <youngmin.nam@samsung.com>
Thu, 2 May 2019 07:43:25 +0000 (16:43 +0900)
committerYoungmin Nam <youngmin.nam@samsung.com>
Fri, 3 May 2019 04:54:26 +0000 (13:54 +0900)
commita78dbd3f1140e65ea19b08769780c5e5100b2ea8
tree80650e57f8ec98cc39fd8cc17755828f606125a8
parentf2003ef9ef51a5ae89814c6061526df3db64fe17
videobuf2: fix conflict during updating 4.14.113

Change-Id: Ie291279a97647b783f9e3579d4bb9fa6fc63b8fa
Signed-off-by: Youngmin Nam <youngmin.nam@samsung.com>
drivers/media/v4l2-core/videobuf2-core.c
drivers/media/v4l2-core/videobuf2-v4l2.c