Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 9 Nov 2005 19:45:00 +0000 (11:45 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 9 Nov 2005 19:45:00 +0000 (11:45 -0800)

Trivial merge