diff options
author | 2009-09-07 20:27:20 +1000 | |
---|---|---|
committer | 2009-09-07 20:27:20 +1000 | |
commit | 11670d3c93210793562748d83502ecbef4034765 (patch) | |
tree | 9e2c33c6249e26b05a2b5db87d4f4840e9049840 /drivers/gpu/drm/radeon/Makefile | |
parent | drm/kms: remove old std mode fallback code. (diff) | |
parent | drm/i915: Put the idle reclocking work on our private workqueue as well. (diff) | |
download | linux-dev-11670d3c93210793562748d83502ecbef4034765.tar.xz linux-dev-11670d3c93210793562748d83502ecbef4034765.zip |
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
Diffstat (limited to 'drivers/gpu/drm/radeon/Makefile')
0 files changed, 0 insertions, 0 deletions