| commit | a45fbc33137b11e479ea8b7d478a1d7e6488971b | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Oct 16 12:43:49 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Oct 16 12:43:49 2008 -0700 |
| tree | 947b39b8d39acd5db2d3a966921ec76443b9b5eb | |
| parent | c813b4e16ead3c3df98ac84419d4df2adf33fe01 [diff] | |
| parent | a64d2b37c2259e169759c1701ac565f0a11dc0ea [diff] |
Merge branch 'agp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6 * 'agp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6: agp/nvidia: Support agp user-memory on nvidia agp. agp/amd-k7: Suspend support for AMD K7 GART driver agp/intel: Reduce extraneous PCI posting reads during init agp: Fix stolen memory counting on G4X.