| commit | 933a6208d84c92d92f9264a2e28d0fc317d41fd1 | |
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | |
| Sun, 29 Jul 2007 02:30:24 +0000 (28 19:30 -0700) | ||
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | |
| Sun, 29 Jul 2007 02:30:24 +0000 (28 19:30 -0700) | ||
| tree | dd774882b46c47bbe7ee44a317ecca34b234993f | treesnapshot (tar.gz zip) |
| parent | 715dad5992b1466320c1ac674db46297e57acf21 | commitdiff |
| parent | f191f144079b0083c6fa7d01a4acbd7263fb5032 | commitdiff |
Merge branch 'agp-patches' of git://git./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
* '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