android: ion: fix merge conflict
authorCho KyongHo <pullip.cho@samsung.com>
Tue, 31 Jul 2018 06:44:04 +0000 (15:44 +0900)
committerJaehyoung Choi <jkkkkk.choi@samsung.com>
Tue, 31 Jul 2018 07:28:54 +0000 (16:28 +0900)
commitaa6032cbac1d0366e6137856ddc422f9e50cc5fa
tree639d0bcd7740c7617ff9cd973e7261c74de517a8
parent44416894c591efb3a012d122b3b44d5c3da645b0
android: ion: fix merge conflict

Change-Id: I67384400657ce896baccc67e7f94ac7bd2988116
Signed-off-by: Cho KyongHo <pullip.cho@samsung.com>
arch/arm64/include/asm/cputype.h
drivers/staging/android/ion/ion.c