Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 9 Sep 2005 00:22:53 +0000 (17:22 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 9 Sep 2005 00:22:53 +0000 (17:22 -0700)

Trivial merge