Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 7 Nov 2005 21:26:58 +0000 (13:26 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 7 Nov 2005 21:26:58 +0000 (13:26 -0800)
commit7079060f3e86ea4c1d4e9c1e356592ef9dcaaa1f
treed56af89cd433440e3b9c94a830838d34b502e446
parent3f00d3e8fb963968a922d821a9a53b503b687e81
parent0a1cc0b6a4abaed5f891d1be3e3d0d7b9b719287
Merge /pub/scm/linux/kernel/git/davej/agpgart
drivers/char/agp/ali-agp.c
drivers/char/agp/amd64-agp.c
drivers/char/agp/ati-agp.c
drivers/char/agp/i460-agp.c
drivers/char/agp/sgi-agp.c
drivers/char/agp/sworks-agp.c