[COMMON] Fix various file for merge conflict

[COMMON] Fix various file for merge conflict

modified:   arch/arm64/include/asm/cputype.h
modified:   arch/arm64/include/asm/simd.h
modified:   arch/arm64/kernel/process.c
modified:   drivers/cpufreq/cpufreq_times.c
modified:   drivers/usb/dwc3/core.c
modified:   include/linux/cpufreq_times.h
modified:   include/linux/fscrypt.h
modified:   include/linux/fscrypt_notsupp.h
modified:   kernel/sched/cpufreq_schedutil.c
modified:   kernel/sched/cputime.c
modified:   net/netfilter/xt_qtaguid.c

Change-Id: I1604d7ee8166932e5329c188c4edb1c828202234
Signed-off-by: Jaehyoung Choi <jkkkkk.choi@samsung.com>