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)
committerYoungmin Nam <youngmin.nam@samsung.com>
Thu, 2 May 2019 06:44:38 +0000 (15:44 +0900)
commitd5937a9d3d06f5c5ef92930bfc915d66b446151b
tree05eac8befff1e5113460fa447c0838a152ba6d6b
parent95b7cc686bf6a4d02ffadccff4dda48367f7869e
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.c
drivers/staging/android/ion/ion_system_heap.c