Merge branch 'agp-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 Nov 2009 01:08:16 +0000 (17:08 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 Nov 2009 01:08:16 +0000 (17:08 -0800)
commit6602b355c2cf8f4c628732827408606075288d28
tree28b4f6fb17f8bf91aee5a112ad468d009467c09a
parent7f6f3507fdfdc8fd4e25ef7d6e760a3b695b6abf
parentec402ba97a6479dd80488b4404a73275e894289f
Merge branch 'agp-fixes' of git://git./linux/kernel/git/airlied/agp-2.6

* 'agp-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6:
  agp/intel-agp: Set dma_mask for capable chipsets before agp_add_bridge()