diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-12-07 23:00:20 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-12-07 23:02:08 +0000 |
| commit | 1a1c69762a14f50dd574a9cbabbfa1b1542f580e (patch) | |
| tree | 117fc29dc9f936f0125e08206c9a60a4e5ffbad7 /drivers/gpu/drm/vmwgfx | |
| parent | 0be732841fb925b6f1242211ea211c022b6ac26c (diff) | |
| parent | 1b39d6f37622f1da70aa2cfd38bfff9a52c13e05 (diff) | |
| download | talos-op-linux-1a1c69762a14f50dd574a9cbabbfa1b1542f580e.tar.gz talos-op-linux-1a1c69762a14f50dd574a9cbabbfa1b1542f580e.zip | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Conflicts:
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/intel_dp.c
Diffstat (limited to 'drivers/gpu/drm/vmwgfx')
0 files changed, 0 insertions, 0 deletions
