summary refs log tree commit diff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-12 13:41:54 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-12 13:41:54 -0700
commit2f41fc806434f8466bb361570589a3f6099ca65d (patch)
treea8ca0d40bf1df9f2edbd9f833376474ae1a95622 /MAINTAINERS
parent0806ca2ab3ef7d7a1bd41a980f661a13ba11acb5 (diff)
parent70e8992ec771793e18d33d3a6f2247e558baf6ac (diff)
downloadlinux-2f41fc806434f8466bb361570589a3f6099ca65d.tar.gz
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
* master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart:
  [AGPGART] Hand off AGP maintainence.
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS7
1 files changed, 3 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index b2c541591e4f..228a45b8dc62 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -315,10 +315,9 @@ M:	zippel@linux-m68k.org
 S:	Maintained
 
 AGPGART DRIVER
-P:	Dave Jones
-M:	davej@codemonkey.org.uk
-W:	http://www.codemonkey.org.uk/projects/agp/
-T:	git kernel.org:/pub/scm/linux/kernel/git/davej/agpgart.git
+P:	David Airlie
+M:	airlied@linux.ie
+T:	git kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6.git
 S:	Maintained
 
 AHA152X SCSI DRIVER