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)
commitf9e6bfa141c5bcf3402d98204b7b23b310be9ddb
tree8d1c9b6a232211893dd64306bb1f46313408111c
parent1a324727caa26cd65a359a958c90fbd251d4aa49
parente7e37ee9c547213d726b29c2510cbb6696050405
Merge /pub/scm/linux/kernel/git/davej/agpgart