android: ion: fix conflict during updating 4.14.113
authorYoungmin Nam <youngmin.nam@samsung.com>
Thu, 2 May 2019 06:44:38 +0000 (15:44 +0900)
committerCosmin Tanislav <demonsingur@gmail.com>
Mon, 22 Apr 2024 17:23:24 +0000 (20:23 +0300)
commit43044cded11302cbf2557dcdfd35617486b200b9
tree992cb0b35da1ef2311d4eb48c0890738967418c0
parentae394f8791e02cdd2a0285fbe70792d50b3cfb6a
android: ion: fix conflict during updating 4.14.113

Change-Id: I2ac5747d69e93d42c22e60311ed61d917fd3854f
Signed-off-by: Youngmin Nam <youngmin.nam@samsung.com>
drivers/staging/android/ion/ion_system_heap.c