Merge branch 'drm-intel-fixes' into drm-intel-next
authorKeith Packard <keithp@keithp.com>
Wed, 29 Jun 2011 17:34:54 +0000 (10:34 -0700)
committerKeith Packard <keithp@keithp.com>
Wed, 29 Jun 2011 17:34:54 +0000 (10:34 -0700)
commit8eb2c0ee67f4853c0e433394f65ef8143a748c80
treeea74ea0878b2f07eb70f2d5b42be5ec42f3bdb5f
parent3e0dc6b01f5301d63046f6deddde2c7f5c57d67a
parent0d72c6fcb5cd215eeab824fac216ea42c5b574aa
Merge branch 'drm-intel-fixes' into drm-intel-next
drivers/gpu/drm/i915/i915_gem.c