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)
commite60a48f5ab35737118e19bc965c640900a842f02
tree2dfc418bc3df4a73d51e45be1030f5692d0303a6
parent2c56554ec596adadd562679ef672d83e290f1732
parent7dd1d9b85cfb63eebf48fa13d3c5d25a3deb3a25
Merge /pub/scm/linux/kernel/git/davej/agpgart

* 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