mirror of
https://github.com/torvalds/linux.git
synced 2024-12-27 13:22:23 +00:00
1fbe6f625f
Merge in the upstream tree to bring in the mainline fixes. Conflicts: drivers/gpu/drm/exynos/exynos_drm_fbdev.c drivers/gpu/drm/nouveau/nouveau_sgdma.c |
||
---|---|---|
.. | ||
exynos_drm_buf.c | ||
exynos_drm_buf.h | ||
exynos_drm_connector.c | ||
exynos_drm_connector.h | ||
exynos_drm_core.c | ||
exynos_drm_crtc.c | ||
exynos_drm_crtc.h | ||
exynos_drm_drv.c | ||
exynos_drm_drv.h | ||
exynos_drm_encoder.c | ||
exynos_drm_encoder.h | ||
exynos_drm_fb.c | ||
exynos_drm_fb.h | ||
exynos_drm_fbdev.c | ||
exynos_drm_fbdev.h | ||
exynos_drm_fimd.c | ||
exynos_drm_gem.c | ||
exynos_drm_gem.h | ||
Kconfig | ||
Makefile |