c1176d6f03
conflict in radeon since new init path merged with vga arb code. Conflicts: drivers/gpu/drm/radeon/radeon.h drivers/gpu/drm/radeon/radeon_asic.h drivers/gpu/drm/radeon/radeon_device.c |
||
|---|---|---|
| .. | ||
| ttm | ||
| drm_cache.h | ||
| drm_core.h | ||
| drm_crtc_helper.h | ||
| drm_crtc.h | ||
| drm_edid.h | ||
| drm_encoder_slave.h | ||
| drm_fb_helper.h | ||
| drm_hashtab.h | ||
| drm_memory.h | ||
| drm_mm.h | ||
| drm_mode.h | ||
| drm_os_linux.h | ||
| drm_pciids.h | ||
| drm_sarea.h | ||
| drm_sman.h | ||
| drm_sysfs.h | ||
| drm.h | ||
| drmP.h | ||
| i810_drm.h | ||
| i830_drm.h | ||
| i915_drm.h | ||
| Kbuild | ||
| mga_drm.h | ||
| r128_drm.h | ||
| radeon_drm.h | ||
| savage_drm.h | ||
| sis_drm.h | ||
| via_drm.h | ||