tree 4e748430ca572e5d0ded552114b1ed90c0b92e1e
parent c2049b3d29f47ed3750226dc51251a3404c85876
parent 04dbff52600719017598f7439bf42e5a72e7de3b
author Dave Airlie <airlied@redhat.com> 1297642414 +1000
committer Dave Airlie <airlied@redhat.com> 1297642414 +1000

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