]> pilppa.org Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8d231c1 55b4d6a)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 29 Jun 2006 20:49:29 +0000 (13:49 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 29 Jun 2006 20:49:29 +0000 (13:49 -0700)
commit82991c6f2c361acc17279b8124d9bf1878973435
tree6c74acf89f3c5f3c9b7f8817e56675bca818c5d3tree | snapshot
parent8d231c11fd0b694c447e59e687754b6999eea0a2commit | diff
parent55b4d6a52195a8f277ffddf755ddaff359878f41commit | 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
Unnamed repository; edit this file 'description' to name the repository.