commit | e60a48f5ab35737118e19bc965c640900a842f02 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@g5.osdl.org> | Tue May 30 11:54:32 2006 -0700 |
committer | Linus Torvalds <torvalds@g5.osdl.org> | Tue May 30 11:54:32 2006 -0700 |
tree | 2dfc418bc3df4a73d51e45be1030f5692d0303a6 | |
parent | 2c56554ec596adadd562679ef672d83e290f1732 [diff] | |
parent | 7dd1d9b85cfb63eebf48fa13d3c5d25a3deb3a25 [diff] |
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