]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge remote branch 'intel/drm-intel-fixes' of /ssd/git/drm-next into drm-fixes
authorDave Airlie <airlied@redhat.com>
Wed, 1 Dec 2010 02:10:34 +0000 (12:10 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 1 Dec 2010 02:10:34 +0000 (12:10 +1000)
* 'intel/drm-intel-fixes' of /ssd/git/drm-next:
  Revert "drm/i915/dp: use VBT provided eDP params if available"
  drm/i915: Clear pfit registers when not used by any outputs
  drm/i915: fix regression due to ba3d8d749b01548b9


Trivial merge