Merge intel drm-intel-next branch
authorDave Airlie <airlied@redhat.com>
Mon, 7 Sep 2009 10:27:20 +0000 (20:27 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 7 Sep 2009 10:27:20 +0000 (20:27 +1000)
commit11670d3c93210793562748d83502ecbef4034765
tree9e2c33c6249e26b05a2b5db87d4f4840e9049840
parent575dc34ee0de867ba83abf25998e0963bff451fa
parent01dfba93d9dfcf6d7abfc55ff5d9d6e76fa01ba0
Merge intel drm-intel-next branch

Merge remote branch 'anholt/drm-intel-next' of ../anholt-2.6 into drm-next

Conflicts:
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_sdvo.c
12 files changed:
drivers/gpu/drm/drm_sysfs.c
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_lvds.c
drivers/gpu/drm/i915/intel_sdvo.c
drivers/gpu/drm/radeon/r100.c
drivers/gpu/drm/radeon/r300.c
drivers/gpu/drm/radeon/radeon.h
drivers/gpu/drm/radeon/radeon_cp.c
drivers/gpu/drm/radeon/radeon_drv.h