| commit | e9e5f8e8d373e72f5c39dafde1ce110fc7082118 | [log] [tgz] |
|---|---|---|
| author | Chris Wilson <chris@chris-wilson.co.uk> | Tue Sep 21 11:19:32 2010 +0100 |
| committer | Chris Wilson <chris@chris-wilson.co.uk> | Tue Sep 21 11:19:32 2010 +0100 |
| tree | 2991e33571a59cc2488daef36dcfeab7bddb9d7f | |
| parent | f899fc64cda8569d0529452aafc0da31c042df2e [diff] | |
| parent | db8c076b9206ea35b1f7299708d5510b17674db2 [diff] |
Merge branch 'drm-intel-fixes' into HEAD Conflicts: drivers/char/agp/intel-agp.c drivers/gpu/drm/i915/intel_crt.c