| commit | 98b96173c777c67daaa7d163a35e591e1928a164 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Fri May 04 17:38:16 2007 -0700 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Fri May 04 17:38:16 2007 -0700 |
| tree | 0530429db1328a00b89972ca67d15e1b61e66ba8 | |
| parent | cf8ba7a95511b86608acb481ad96219fe2da4b3a [diff] | |
| parent | 881ba59d4685b28433bf313b6db51672a02696a3 [diff] |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart * master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart: [AGPGART] sworks-agp: Switch to PCI ref counting APIs [AGPGART] Nvidia AGP: Use refcount aware PCI interfaces [AGPGART] Fix sparse warning in sgi-agp.c [AGPGART] Intel-agp adjustments [AGPGART] Move [un]map_page_into_agp into asm/agp.h [AGPGART] Add missing calls to global_flush_tlb() to ali-agp [AGPGART] prevent probe collision of sis-agp and amd64_agp