| commit | 82991c6f2c361acc17279b8124d9bf1878973435 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Thu Jun 29 13:49:29 2006 -0700 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Thu Jun 29 13:49:29 2006 -0700 |
| tree | 6c74acf89f3c5f3c9b7f8817e56675bca818c5d3 | |
| parent | 8d231c11fd0b694c447e59e687754b6999eea0a2 [diff] | |
| parent | 55b4d6a52195a8f277ffddf755ddaff359878f41 [diff] |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart * master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart: [AGPGART] Make AGP depend on PCI [AGPGART] remove unused variable [AGPGART] Fix pci_register_driver checking in amd64-agp [AGPGART] Compile fix for ati-agp [AGPGART] Suspend/Resume support for nVidia nForce AGP. [AGPGART] Suspend/Resume improvements for ATI AGP [AGPGART] Whitespace cleanups for ati-agp