commit 65d76fc4b3161ee1e7034a6f764d1151eb51a555
author Linus Torvalds <torvalds@linux-foundation.org> Fri Feb 19 19:33:51 2010 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Fri Feb 19 19:33:51 2010 -0800
tree 06dccc74066a73ff12afaa4409a67b4d6b37eeb3
parent f8b55f251012e104093e105483c45c5d85ad3040
parent 635f1a31292087a2e99568bf4451c10ee287adaa

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