Merge branch 'drm-intel-fixes' into drm-intel-next
authorKeith Packard <keithp@keithp.com>
Mon, 25 Jul 2011 21:57:41 +0000 (14:57 -0700)
committerKeith Packard <keithp@keithp.com>
Mon, 25 Jul 2011 21:57:41 +0000 (14:57 -0700)
commit887a82ee80b42bb14ba70f8138292023d5040b08
tree4a3c9fc0ddbdf9b07fbd260f4e013423ec1ce1f6
parentdf7976797fa9af161690dbf4dee81ed92cdc150f
parenta65e34c79c88895766ab1f8a5afa451eed26622b
Merge branch 'drm-intel-fixes' into drm-intel-next
drivers/gpu/drm/i915/i915_irq.c
drivers/gpu/drm/i915/intel_dp.c