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 |
||
|---|---|---|
| .. | ||
| Makefile | ||
| ttm_agp_backend.c | ||
| ttm_bo.c | ||
| ttm_bo_manager.c | ||
| ttm_bo_util.c | ||
| ttm_bo_vm.c | ||
| ttm_execbuf_util.c | ||
| ttm_lock.c | ||
| ttm_memory.c | ||
| ttm_module.c | ||
| ttm_object.c | ||
| ttm_page_alloc.c | ||
| ttm_page_alloc_dma.c | ||
| ttm_tt.c | ||