tree 28b4f6fb17f8bf91aee5a112ad468d009467c09a
parent 7f6f3507fdfdc8fd4e25ef7d6e760a3b695b6abf
parent ec402ba97a6479dd80488b4404a73275e894289f
author Linus Torvalds <torvalds@linux-foundation.org> 1258592896 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1258592896 -0800

Merge branch 'agp-fixes' of git://git.kernel.org/pub/scm/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()