| commit | 11670d3c93210793562748d83502ecbef4034765 | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Mon Sep 07 20:27:20 2009 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Mon Sep 07 20:27:20 2009 +1000 |
| tree | 9e2c33c6249e26b05a2b5db87d4f4840e9049840 | |
| parent | 575dc34ee0de867ba83abf25998e0963bff451fa [diff] | |
| parent | 01dfba93d9dfcf6d7abfc55ff5d9d6e76fa01ba0 [diff] |
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