mirror of
https://github.com/hardkernel/linux.git
synced 2026-03-25 12:00:22 +09:00
77cc9a472c
Conflicts: drivers/gpu/arm/mali/__malidrv_build_info.c drivers/gpu/arm/ump/Kconfig drivers/gpu/arm/ump/Makefile drivers/gpu/arm/ump/arch-default/config.h drivers/gpu/arm/ump/common/ump_kernel_api.c drivers/gpu/arm/ump/common/ump_kernel_common.c drivers/gpu/arm/ump/common/ump_kernel_common.h drivers/gpu/arm/ump/common/ump_kernel_descriptor_mapping.c drivers/gpu/arm/ump/common/ump_kernel_descriptor_mapping.h drivers/gpu/arm/ump/common/ump_kernel_memory_backend.h drivers/gpu/arm/ump/common/ump_kernel_ref_drv.c drivers/gpu/arm/ump/common/ump_kernel_types.h drivers/gpu/arm/ump/common/ump_osk.h drivers/gpu/arm/ump/common/ump_uk_types.h drivers/gpu/arm/ump/common/ump_ukk.h drivers/gpu/arm/ump/include/ump_kernel_interface.h drivers/gpu/arm/ump/include/ump_kernel_interface_ref_drv.h drivers/gpu/arm/ump/include/ump_kernel_platform.h drivers/gpu/arm/ump/linux/license/gpl/ump_kernel_license.h drivers/gpu/arm/ump/linux/ump_ioctl.h drivers/gpu/arm/ump/linux/ump_kernel_linux.c drivers/gpu/arm/ump/linux/ump_kernel_memory_backend_dedicated.c drivers/gpu/arm/ump/linux/ump_kernel_memory_backend_os.c drivers/gpu/arm/ump/linux/ump_memory_backend.c drivers/gpu/arm/ump/linux/ump_osk_low_level_mem.c drivers/gpu/arm/ump/linux/ump_osk_misc.c drivers/gpu/arm/ump/linux/ump_ukk_ref_wrappers.c drivers/gpu/arm/ump/linux/ump_ukk_ref_wrappers.h drivers/gpu/arm/ump/linux/ump_ukk_wrappers.c drivers/gpu/arm/ump/linux/ump_ukk_wrappers.h drivers/gpu/drm/exynos/exynos_drm_crtc.c drivers/gpu/drm/exynos/exynos_drm_fbdev.c