drivers/gpu/drm/radeon/radeon_object.c · c48c43e422c1404fd72c57d1d21a6f6d01e18900 · nexedi / linux · GitLab

Find file Blame History Permalink

Merge branch 'drm-fixes' of /home/airlied/kernel/linux-2.6 into drm-core-next · b7ae5056
Dave Airlie authored Oct 19, 2010
```
Conflicts:
	drivers/gpu/drm/i915/intel_fb.c
	drivers/gpu/drm/radeon/r600_blit_kms.c
	drivers/gpu/drm/ttm/ttm_bo.c
```
b7ae5056

radeon_object.c 13.4 KB