]> err.no Git - linux-2.6/commitdiff
Merge of master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 7 Jun 2005 20:41:30 +0000 (13:41 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 7 Jun 2005 20:41:30 +0000 (13:41 -0700)

Trivial merge