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)

Trivial merge