tree 2dfc418bc3df4a73d51e45be1030f5692d0303a6
parent 2c56554ec596adadd562679ef672d83e290f1732
parent 7dd1d9b85cfb63eebf48fa13d3c5d25a3deb3a25
author Linus Torvalds <torvalds@g5.osdl.org> 1149015272 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1149015272 -0700

Merge master.kernel.org:/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