summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-29 04:30:24 +0200
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-29 04:30:24 +0200
commit933a6208d84c92d92f9264a2e28d0fc317d41fd1 (patch)
treedd774882b46c47bbe7ee44a317ecca34b234993f /fs
parentMerge master.kernel.org:/home/rmk/linux-2.6-arm (diff)
parentagp: AMD AGP is used on UP1100 & UP1500 alpha boxen (diff)
downloadlinux-933a6208d84c92d92f9264a2e28d0fc317d41fd1.tar.xz
linux-933a6208d84c92d92f9264a2e28d0fc317d41fd1.zip
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
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions