| commit | 710f957846cff998c681f3701f6f90eda896458f | [log] [tgz] |
|---|---|---|
| author | Chris Wilson <chris@chris-wilson.co.uk> | Tue Feb 22 15:58:46 2011 +0000 |
| committer | Chris Wilson <chris@chris-wilson.co.uk> | Tue Feb 22 16:09:03 2011 +0000 |
| tree | ba22ee7b469dd0cee974019cc32630838691f3af | |
| parent | e953fd7bb32f55309a96abd5ceba9cf68d221434 [diff] | |
| parent | 011b9910bdaf2e52c48c012490ab444fceea1959 [diff] |
Merge branch 'drm-intel-fixes' into drm-intel-next Merge in the conflicting eDP fix. Conflicts: drivers/gpu/drm/i915/i915_irq.c drivers/gpu/drm/i915/intel_display.c Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>