Merge branch 'drm-intel-fixes' into drm-intel-next
authorKeith Packard <keithp@keithp.com>
Thu, 7 Jul 2011 20:39:38 +0000 (13:39 -0700)
committerKeith Packard <keithp@keithp.com>
Thu, 7 Jul 2011 20:39:38 +0000 (13:39 -0700)
commitbc67f799e7667fb3c00286f2415c3cc44a253aec
tree271ae5f17012caafe3d3ac3daf0776808b71cf48
parent89c6143263ef8e14e42e17324a234418d8030b10
parentc7ad381078ee1b5ce2ab5274bd5f12fee6e1e59a
Merge branch 'drm-intel-fixes' into drm-intel-next
drivers/gpu/drm/i915/intel_dp.c