“ad92c8bfff579165739705235d0909ebc94de2cd”上不存在“drivers/gpu/drm/imx/parallel-display.c”
Merge branch 'samsung/cleanup-exynos-clock' into next/soc
Conflicts:
arch/arm/mach-exynos/clock-exynos4.c
arch/arm/mach-exynos/clock.c
The cleanup moves the exynos4 clock implementation away, while
the other branch modifies the file with the old name.
Signed-off-by: NArnd Bergmann <arnd@arndb.de>
Showing
想要评论请 注册 或 登录