drm: merge Linux master into HEAD
authorDave Airlie <airlied@redhat.com>
Sun, 29 Mar 2009 00:22:18 +0000 (20:22 -0400)
committerDave Airlie <airlied@redhat.com>
Sun, 29 Mar 2009 00:22:18 +0000 (20:22 -0400)
Conflicts:
drivers/gpu/drm/drm_info.c
drivers/gpu/drm/drm_proc.c
drivers/gpu/drm/i915/i915_gem_debugfs.c

1  2 
drivers/gpu/drm/drm_info.c
drivers/gpu/drm/drm_sysfs.c
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_gem.c
include/drm/drm_pciids.h
include/drm/radeon_drm.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge