Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 21 Nov 2005 18:56:30 +0000 (10:56 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 21 Nov 2005 18:56:30 +0000 (10:56 -0800)

Trivial merge