tree e1180ba7cbd123fb2f0bf510a955704725465776
parent 18240904960a39e582ced8ba8ececb10b8c22dd3
parent 121264827656f5f06328b17983c796af17dc5949
author Linus Torvalds <torvalds@linux-foundation.org> 1253031487 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1253031487 -0700

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

* 'agp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6:
  agp/intel: remove restore in resume
  agp: fix uninorth build
  intel-agp: Set dma mask for i915
  agp: kill phys_to_gart() and gart_to_phys()
  intel-agp: fix sglist allocation to avoid vmalloc()
  intel-agp: Move repeated sglist free into separate function
  agp: Switch agp_{un,}map_page() to take struct page * argument
  agp: tidy up handling of scratch pages w.r.t. DMA API
  intel_agp: Use PCI DMA API correctly on chipsets new enough to have IOMMU
  agp: Add generic support for graphics dma remapping
  agp: Switch mask_memory() method to take address argument again, not page