From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 18 Feb 2010 16:10:21 +0000 (-0800)
Subject: Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied... 
X-Git-Tag: v2.6.33~33
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=86404ab60df2ea65f39be936fc11762b642810c3;p=~shefty%2Frdma-dev.git

Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/radeon/kms: fix bo's fence association
  drm/radeon/kms: fix indirect buffer management V2
  drm/edid: Fix interlaced detailed timings to be frame size, not field.
  drm/vmwgfx: Use fb handover mechanism instead of stealth mode.
  drm/radeon/kms: use udelay for short delays
  drm/nouveau: Force TV encoder DPMS reinit after resume.
  drm/nouveau: use mutex for vbios lock
---

86404ab60df2ea65f39be936fc11762b642810c3