Merge branch 'agp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Oct 2008 19:43:49 +0000 (12:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Oct 2008 19:43:49 +0000 (12:43 -0700)
commita45fbc33137b11e479ea8b7d478a1d7e6488971b
tree947b39b8d39acd5db2d3a966921ec76443b9b5eb
parentc813b4e16ead3c3df98ac84419d4df2adf33fe01
parenta64d2b37c2259e169759c1701ac565f0a11dc0ea
Merge branch 'agp-next' of git://git./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.
drivers/char/agp/amd-k7-agp.c
drivers/char/agp/intel-agp.c
drivers/char/agp/nvidia-agp.c