mirror of
https://github.com/hardkernel/linux.git
synced 2026-04-15 01:50:40 +09:00
Conflicts: drivers/clk/rockchip/clk-ops.h drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi.c drivers/video/rockchip/rk_fb.c
Conflicts: drivers/clk/rockchip/clk-ops.h drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi.c drivers/video/rockchip/rk_fb.c