From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 4 May 2011 01:52:09 +0000 (-0700)
Subject: Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied... 
X-Git-Tag: v2.6.39-rc6~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d2af6768f6128a682e7490d04e2f3d660bd6fb76;p=users%2Fhch%2Fmisc.git

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

* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/radeon/kms: fix gart setup on fusion parts (v2)
  drm: Send pending vblank events before disabling vblank.
  drm/radeon: fix regression on atom cards with hardcoded EDID record.
  drm/radeon/kms: add some new pci ids
---

d2af6768f6128a682e7490d04e2f3d660bd6fb76