From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 20 Feb 2010 03:33:51 +0000 (-0800)
Subject: Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied... 
X-Git-Tag: v2.6.33~29
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=65d76fc4b3161ee1e7034a6f764d1151eb51a555;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: bump the UMS driver version number to indicate rv740 fix
  drm/radeon/kms: free fence IB if it wasn't emited at IB free time
  drm/ttm: fix caching problem on non-PAT systems.
  drm/radeon/rv740: fix backend setup
  drm/radeon/kms: fix shared ddc detection
  drm/radeon/kms/rs600: add connector quirk
  vgaarb: fix "target=default" passing
---

65d76fc4b3161ee1e7034a6f764d1151eb51a555