From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 18 Mar 2008 14:32:23 +0000 (-0700)
Subject: Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied... 
X-Git-Tag: v2.6.25-rc7~111
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=ff69c00f0a58383f1f60dd2756e54a857f08d249;p=~shefty%2Frdma-dev.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/ati_pcigart: fix the PCIGART to use drm_pci to allocate GART table.
  drm/radeon: fixup RV550 chip family
  drm/via: attempt again to stabilise the AGP DMA command submission.
  drm: Fix race that can lockup the kernel
---

ff69c00f0a58383f1f60dd2756e54a857f08d249