diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-01 13:42:29 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-01 13:44:41 +0000 |
| commit | f2a630bfeccc87c3f89aaf8b4a8902f1e4e9f7ca (patch) | |
| tree | 5c9f6950c1e8dc9190ab923c3c374db132fa1631 /drivers/gpu/drm/i830 | |
| parent | 0f8c6d7ca9257d6a01671ab69b897860d3ae9bc0 (diff) | |
| parent | c6afd658073f9fdb4cc80664dac71fa9db6fdf35 (diff) | |
| download | kernel_samsung_smdk4412-f2a630bfeccc87c3f89aaf8b4a8902f1e4e9f7ca.zip kernel_samsung_smdk4412-f2a630bfeccc87c3f89aaf8b4a8902f1e4e9f7ca.tar.gz kernel_samsung_smdk4412-f2a630bfeccc87c3f89aaf8b4a8902f1e4e9f7ca.tar.bz2 | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Conflicts:
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/i915_gem_evict.c
Diffstat (limited to 'drivers/gpu/drm/i830')
0 files changed, 0 insertions, 0 deletions