Merge branch 'drm-intel-fixes' into drm-intel-next
authorKeith Packard <keithp@keithp.com>
Tue, 28 Jun 2011 17:29:47 +0000 (10:29 -0700)
committerKeith Packard <keithp@keithp.com>
Tue, 28 Jun 2011 17:29:47 +0000 (10:29 -0700)
commit6ae77e6b6ae20c280df8ca78e9c9d9a8ccfe7a98
tree4c956b1d8104610819104652a8dd4f22a6627963
parent1e5216e43846b7758b2a04b3612c475608a4b708
parentf01c22fd59aa10a3738ede20fd4b9b6fd1e2eac3
Merge branch 'drm-intel-fixes' into drm-intel-next
drivers/gpu/drm/i915/i915_gem.c