From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 15 Sep 2009 16:18:07 +0000 (-0700)
Subject: Merge branch 'agp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied... 
X-Git-Tag: MMI-PSA29.97-13-9~26955
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=66a4fe0cb80a9fde8cb173289afb863fd279466a;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'agp-next' of git://git./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
---

66a4fe0cb80a9fde8cb173289afb863fd279466a