diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-29 13:49:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-29 13:49:29 -0700 |
| commit | 82991c6f2c361acc17279b8124d9bf1878973435 (patch) | |
| tree | 6c74acf89f3c5f3c9b7f8817e56675bca818c5d3 /arch/cris | |
| parent | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff) | |
| parent | Merge ../linus (diff) | |
| download | linux-dev-82991c6f2c361acc17279b8124d9bf1878973435.tar.xz linux-dev-82991c6f2c361acc17279b8124d9bf1878973435.zip | |
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
Diffstat (limited to 'arch/cris')
0 files changed, 0 insertions, 0 deletions