| commit | 150f8815bbd15c1a91f74033c048fadcd5f3c715 | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Wed Dec 01 12:10:34 2010 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Wed Dec 01 12:10:34 2010 +1000 |
| tree | 9219890d645a1844a146d99a0820c141a44a824c | |
| parent | c5027dec02c96964847fa68d512318ee5f6f7a19 [diff] | |
| parent | 3cf2efb1a7c68d55d60dcb2ed9609e1a2fc25952 [diff] |
Merge remote branch 'intel/drm-intel-fixes' of /ssd/git/drm-next into drm-fixes * '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