]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
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)
commit90f959bcb386da2c71613dcefc6a285e054a539e
treeee3e9dd4111d4aad12e579cb0c2c159114dff263
parent41f13fe81dd1b08723ab9f3fc3c7f29cfa81f1a5
parent07d43ba98621f08e252a48c96b258b4d572b0257
drm: merge Linux master into HEAD

Conflicts:
drivers/gpu/drm/drm_info.c
drivers/gpu/drm/drm_proc.c
drivers/gpu/drm/i915/i915_gem_debugfs.c
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