From: Dave Airlie Date: Mon, 14 Feb 2011 00:13:34 +0000 (+1000) Subject: Merge remote branch 'intel/drm-intel-fixes' of /ssd/git/drm-next into drm-fixes X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=dc7cec23c7f02ae522d5e7066b5d0df492d12bea;p=deliverable%2Flinux.git Merge remote branch 'intel/drm-intel-fixes' of /ssd/git/drm-next into drm-fixes * 'intel/drm-intel-fixes' of /ssd/git/drm-next: drm/i915: Fix resume regression from 5d1d0cc drm/i915/tv: Use polling rather than interrupt-based hotplug drm/i915: Trigger modesetting if force-audio changes drm/i915/sdvo: If we have an EDID confirm it matches the mode of the connection drm/i915: Disable RC6 on Ironlake drm/i915/lvds: Restore dithering on native modes for gen2/3 drm/i915: Invalidate TLB caches on SNB BLT/BSD rings --- dc7cec23c7f02ae522d5e7066b5d0df492d12bea