Merge branch 'drm-intel-fixes' into drm-intel-next
authorKeith Packard <keithp@keithp.com>
Mon, 25 Jul 2011 22:22:19 +0000 (15:22 -0700)
committerKeith Packard <keithp@keithp.com>
Mon, 25 Jul 2011 22:22:19 +0000 (15:22 -0700)
commitcf96e46fcd147856fd8151fab91c410f0ec16c47
tree0d0c3612cc70e6d886464b2bdc7766d64e7af6c8
parent887a82ee80b42bb14ba70f8138292023d5040b08
parente85194641bec56179dcf5e1704ce5c6bf30340c6
Merge branch 'drm-intel-fixes' into drm-intel-next
drivers/gpu/drm/i915/intel_dp.c