Merge branch 'drm-intel-fixes' into drm-intel-next
authorKeith Packard <keithp@keithp.com>
Wed, 3 Aug 2011 17:41:19 +0000 (10:41 -0700)
committerKeith Packard <keithp@keithp.com>
Wed, 3 Aug 2011 17:41:19 +0000 (10:41 -0700)
commit3d208bef113657e27f8731921454d6da408b76c5
tree8918890a296cefe35ada0bf813f6a30fdb8121b9
parent62ac41a6e443ef26b9de862c6e20c088e2b04dde
parent4edd17a25c99f34bd7a75c1daf31afe840237da8
Merge branch 'drm-intel-fixes' into drm-intel-next
drivers/gpu/drm/i915/intel_dp.c