Merge branch 'drm-intel-fixes' into drm-intel-next
authorKeith Packard <keithp@keithp.com>
Thu, 7 Jul 2011 22:39:51 +0000 (15:39 -0700)
committerKeith Packard <keithp@keithp.com>
Thu, 7 Jul 2011 22:39:51 +0000 (15:39 -0700)
commit6fe5a7e3cac5b60774186a95bbb7555fa604080c
tree5ee9e7b5c553ce4c9dc1c0b7190f405e165787a7
parentbc67f799e7667fb3c00286f2415c3cc44a253aec
parent1083694ab052e5ba38a8f9a057c4745448977837
Merge branch 'drm-intel-fixes' into drm-intel-next
drivers/gpu/drm/i915/i915_drv.c