mirror of
https://github.com/hardkernel/linux.git
synced 2026-04-10 23:18:10 +09:00
Conflicts: drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.c drivers/gpu/arm/midgard/backend/gpu/mali_kbase_power_model_simple.c drivers/gpu/arm/midgard/backend/gpu/mali_kbase_power_model_simple.h drivers/gpu/arm/midgard/mali_kbase_defs.h Change-Id: Ia7b8004b09ce31a5af6414c27b8ec776c247835a Signed-off-by: chenzhen <chenzhen@rock-chips.com>