Merge branch 'drm-intel-fixes' into drm-intel-next
authorKeith Packard <keithp@keithp.com>
Tue, 21 Jun 2011 19:02:57 +0000 (12:02 -0700)
committerKeith Packard <keithp@keithp.com>
Tue, 21 Jun 2011 19:02:57 +0000 (12:02 -0700)
commit2cd1176bd9e92924242e779dcc5c8fc922f96659
treee9daa254647af2e7d9f99694e19976df0ea2a14d
parenta18711120764dd96ed2ee6a4d436c448542bad77
parente92d03bff9a0d0bcbb812c9b1290ca96c9338d45
Merge branch 'drm-intel-fixes' into drm-intel-next
drivers/gpu/drm/i915/i915_gem.c