projects / platform / kernel / linux-stable.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: febb72a 2e7a448)
Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel...
authorDave Airlie <airlied@redhat.com>
Mon, 7 May 2012 10:00:31 +0000 (11:00 +0100)
committerDave Airlie <airlied@redhat.com>
Mon, 7 May 2012 10:00:39 +0000 (11:00 +0100)
commitc42b5da2f02575fea4e0bd119cf7923030b9db66
tree4b349e3202eea7152d4f0725c0884d984ec882adtree | snapshot
parentfebb72a6e4cc6c8cffcc1ea649a3fb364f1ea432commit | diff
parent2e7a44814d802c8ba479164b8924070cd908d6b5commit | diff
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
Domain: System / Kernel;