[COMMON] arm64: fix conflict file related cpu
authorSangkyu Kim <skwith.kim@samsung.com>
Tue, 31 Jul 2018 07:12:33 +0000 (16:12 +0900)
committerJaehyoung Choi <jkkkkk.choi@samsung.com>
Tue, 31 Jul 2018 08:21:32 +0000 (17:21 +0900)
commit1cac958565e9d0a7b94fd02ac7dfa7867afb60f8
treea0dffe39837dcfa77b6dd2478b901a06c89f733a
parentfc4e702697fdf50e550489df70ebd778f54d2262
[COMMON] arm64: fix conflict file related cpu

Change-Id: I678a907cc4a6e0a6ca3604165ddbcda8b445db60
Signed-off-by: Sangkyu Kim <skwith.kim@samsung.com>
Signed-off-by: Jaehyoung Choi <jkkkkk.choi@samsung.com>
include/linux/cpufreq_times.h
kernel/sched/cpufreq_schedutil.c
kernel/sched/cputime.c