]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit9be51580297dc56af08a3d3c714e17eb65ec2b08
tree947b39b8d39acd5db2d3a966921ec76443b9b5eb
parentaacbd9e5a6ca71b79a871c1a4a71a7e9a69ec9d6
parentec2e9ea3d47466523f05b387691d58f461f6be63
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.
drivers/char/agp/amd-k7-agp.c
drivers/char/agp/intel-agp.c
drivers/char/agp/nvidia-agp.c