Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 30 May 2006 18:54:32 +0000 (11:54 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 30 May 2006 18:54:32 +0000 (11:54 -0700)
* master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart:
  [AGPGART] VIA PT880 Ultra support.
  [AGPGART] Fix Nforce3 suspend on amd64.
  [AGPGART] Enable SIS AGP driver on x86-64 for EM64T systems


Trivial merge