From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 15 Oct 2007 15:18:44 +0000 (-0700)
Subject: Merge branch 'agp-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/agp-2.6
X-Git-Tag: v2.6.24-rc1~1291
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=3d06f7a5f74a813cee817c4b30b5e6f0398da0be;p=linux.git

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

* 'agp-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/agp-2.6:
  fix use after free in amd create gatt pages
  AGP fix race condition between unmapping and freeing pages
---

3d06f7a5f74a813cee817c4b30b5e6f0398da0be