tree 4b349e3202eea7152d4f0725c0884d984ec882ad
parent febb72a6e4cc6c8cffcc1ea649a3fb364f1ea432
parent 2e7a44814d802c8ba479164b8924070cd908d6b5
author Dave Airlie <airlied@redhat.com> 1336384831 +0100
committer Dave Airlie <airlied@redhat.com> 1336384839 +0100

Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes

Daniel wrote:

2 little patches:
- One regression fix to disable sdvo hotplug on broken hw.
- One patch to upconvert the snb hang workaround from patch v1 to patch
 v2.

* 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel:
  drm/i915: Do no set Stencil Cache eviction LRA w/a on gen7+
  drm/i915: disable sdvo hotplug on i945g/gm