Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 21 Feb 2006 04:08:23 +0000 (20:08 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 21 Feb 2006 04:08:23 +0000 (20:08 -0800)
commit0b1fc9b86f49e1e73e473e06a16556ca0dce53ae
tree0a8dae6c730dfe5279d61cdd4b5c2936f9e471a1
parent6bd25e78211d0591060db3ece10443096ef96c50
parentb41c82eb5fb49912ce26c51ec221ba35e06c7d9b
Merge /pub/scm/linux/kernel/git/davej/agpgart