git.stricted.de - GitHub/LineageOS/android_kernel_motorola

author	Youngmin Nam <youngmin.nam@samsung.com>
	Thu, 2 May 2019 08:43:32 +0000 (17:43 +0900)
committer	Cosmin Tanislav <demonsingur@gmail.com>
	Mon, 22 Apr 2024 17:24:58 +0000 (20:24 +0300)
commit	0fdae4dc038c026afc8c573014618f7d0909d6e0
tree	e8a41558adac3afbb8c4a05e7485b70e39f91ae5	tree \| snapshot (tar.gz zip)
parent	78bdf5be2b7522644dac15ac5f3c9a8f97099c2f	commit \| diff

[COMMON] kernel: cpu: fix conflict

Change-Id: I1fa521368b3dffbd7bb572dac10e403c7bd07d2b
Signed-off-by: Youngmin Nam <youngmin.nam@samsung.com>

drivers/cpufreq/exynos-acme.c		diff \| blob \| blame \| history
drivers/soc/samsung/exynos-cpupm.c		diff \| blob \| blame \| history
drivers/soc/samsung/exynos-topology.c		diff \| blob \| blame \| history
include/linux/tick.h		diff \| blob \| blame \| history
init/Kconfig		diff \| blob \| blame \| history
kernel/sched/cpufreq_schedutil.c		diff \| blob \| blame \| history
kernel/sched/ems/lbt.c		diff \| blob \| blame \| history
kernel/sched/ems/ontime.c		diff \| blob \| blame \| history
kernel/sched/fair.c		diff \| blob \| blame \| history
kernel/sched/sched.h		diff \| blob \| blame \| history
kernel/time/tick-sched.c		diff \| blob \| blame \| history