tree 2bba8ab48e9a3d70ee3161306ea47962543df855
parent 13626cb91f41df803c54047172bfc7a716e36c2b
parent bdc3e603cda3433c2ccc2069d28f7f3cd319cfc6
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1192461524 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1192461524 -0700

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