| commit | 51c8b4071d84d46cc100baa5931ad06b2a823c95 | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Thu Aug 20 13:38:04 2009 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Thu Aug 20 13:38:04 2009 +1000 |
| tree | 098cf9d41ce1c548d922708a770a9efe35e434df | |
| parent | a987fcaa805fcb24ba885c2e29fd4fdb6816f08f [diff] | |
| parent | 6c30c53fd5ae6a99a23ad78e90c428d2c8ffb07f [diff] |
Merge Linus master to drm-next linux-next conflict reported needed resolution. Conflicts: drivers/gpu/drm/drm_crtc.c drivers/gpu/drm/drm_edid.c drivers/gpu/drm/i915/intel_sdvo.c drivers/gpu/drm/radeon/radeon_ttm.c drivers/gpu/drm/ttm/ttm_bo.c