tree c4f0da77fbad8f7a002bd43be9c28a1f1214f1a1
parent 9e5858244926f4fddf8ba38a6b4fa3fe68e93836
parent b05c23851ab820b1957cd2f322eaa1ac44c196bd
author Linus Torvalds <torvalds@linux-foundation.org> 1205850743 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1205850743 -0700

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