From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 16 Oct 2008 19:43:49 +0000 (-0700)
Subject: Merge branch 'agp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied... 
X-Git-Tag: v2.6.28-rc1~283
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a45fbc33137b11e479ea8b7d478a1d7e6488971b;p=linux-2.6-omap-h63xx.git

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.
---

a45fbc33137b11e479ea8b7d478a1d7e6488971b