commit | d6b8395262a9d90e4ab11b614a5fb8f858e2b3df | [log] [tgz] |
---|---|---|
author | Dave Airlie <airlied@redhat.com> | Thu Apr 19 14:13:52 2012 +0100 |
committer | Dave Airlie <airlied@redhat.com> | Thu Apr 19 14:13:52 2012 +0100 |
tree | afe4b8ae6affe84e95169bcc0c3bf1c32004a568 | |
parent | e36325071832f1ba96ac54fb8ba1459f08b05dd8 [diff] | |
parent | 99d9acdd0c5ce970eaf8e8671c0bc4cb7c6fb0c1 [diff] |
Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes * 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel: drm/i915: Do not set "Enable Panel Fitter" on SNB pageflips drm/i915: Hold mode_config lock whilst changing mode for lastclose() drm/i915: don't clobber the special upscaling lvds timings