Merge branch 'agp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

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

diff --cc drivers/char/agp/amd-k7-agp.c
Simple merge

diff --cc drivers/char/agp/intel-agp.c
Simple merge

diff --cc drivers/char/agp/nvidia-agp.c
Simple merge