From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 29 Jun 2006 20:49:29 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
X-Git-Tag: v2.6.18-rc1~352
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82991c6f2c361acc17279b8124d9bf1878973435;p=linux-2.6

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
---

82991c6f2c361acc17279b8124d9bf1878973435