Merge branch 'drm-intel-fixes' into drm-intel-next
authorKeith Packard <keithp@keithp.com>
Tue, 12 Jul 2011 17:40:25 +0000 (10:40 -0700)
committerKeith Packard <keithp@keithp.com>
Tue, 12 Jul 2011 17:40:25 +0000 (10:40 -0700)
commit9aa73a51c91cb0d0af4caaa9823969c1a1179a12
tree4a7b4fa5f2b9915154fbd9cc678d279026071909
parentc7c369472dad852f6fe06a8be94dea72de784934
parenta94919eaddaa3fede1df8563ce4d761a75374645
Merge branch 'drm-intel-fixes' into drm-intel-next
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_drv.c