From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sun, 29 Jul 2007 02:30:24 +0000 (-0700)
Subject: Merge branch 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied... 
X-Git-Tag: v2.6.23-rc2~181
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=933a6208d84c92d92f9264a2e28d0fc317d41fd1;p=linux.git

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

* 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6:
  agp: AMD AGP is used on UP1100 & UP1500 alpha boxen
  intel_agp: really fix 945/965GME
  agp: don't lock pages
  AGP: document boot options
  Fix "use after free" / "double free" bug in ati_create_gatt_pages / ati_free_gatt_pages
---

933a6208d84c92d92f9264a2e28d0fc317d41fd1