[COMMON] ion: fix conflicts
authorCho KyongHo <pullip.cho@samsung.com>
Tue, 3 Apr 2018 14:12:17 +0000 (23:12 +0900)
committerJanghyuck Kim <janghyuck.kim@samsung.com>
Mon, 23 Jul 2018 05:39:31 +0000 (14:39 +0900)
commitd1ab1cbde22232a68cf6ddf105ad58d8935dc0fc
tree2fcf7520e01127fccd707a1803b767a9393f7fad
parente7e1a8534cae213a781affa7b5db35e75aee77dd
[COMMON] ion: fix conflicts

Change-Id: I250c65be08f436f8cef3fc00674587a74886ea61
Signed-off-by: Cho KyongHo <pullip.cho@samsung.com>
drivers/staging/android/ion/ion_cma_heap.c