diff options
| author | Linus Torvalds | 2009-09-15 18:18:07 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2009-09-15 18:18:07 +0200 |
| commit | 66a4fe0cb80a9fde8cb173289afb863fd279466a (patch) | |
| tree | e1180ba7cbd123fb2f0bf510a955704725465776 /net | |
| parent | Merge branch 'for-linus3' of git://git.kernel.org/pub/scm/linux/kernel/git/jm... (diff) | |
| parent | agp/intel: remove restore in resume (diff) | |
| download | kernel-qcow2-linux-66a4fe0cb80a9fde8cb173289afb863fd279466a.tar.gz kernel-qcow2-linux-66a4fe0cb80a9fde8cb173289afb863fd279466a.tar.xz kernel-qcow2-linux-66a4fe0cb80a9fde8cb173289afb863fd279466a.zip | |
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
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions