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.

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.
2f41fc80 · Linus Torvalds · 0806ca2a · 70e8992e · 2f41fc80 · 2f41fc80
Commit 2f41fc80 authored Jul 12, 2007 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 5 deletions

MAINTAINERS MAINTAINERS +3 -4

drivers/char/agp/backend.c drivers/char/agp/backend.c +1 -1

No files found.
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -315,10 +315,9 @@ M:	zippel@linux-m68k.org
 S:	Maintained
 AGPGART DRIVER
-P:	Dave Jones
+P:	David Airlie
-M:	davej@codemonkey.org.uk
+M:	airlied@linux.ie
-W:	http://www.codemonkey.org.uk/projects/agp/
+T:	git kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6.git
-T:	git kernel.org:/pub/scm/linux/kernel/git/davej/agpgart.git
 S:	Maintained
 AHA152X SCSI DRIVER

--- a/drivers/char/agp/backend.c
+++ b/drivers/char/agp/backend.c
@@ -321,7 +321,7 @@ EXPORT_SYMBOL(agp_try_unsupported_boot);
 static int __init agp_init(void)
 {
 	if (!agp_off)
-		printk(KERN_INFO "Linux agpgart interface v%d.%d (c) Dave Jones\n",
+		printk(KERN_INFO "Linux agpgart interface v%d.%d\n",
 			AGPGART_VERSION_MAJOR, AGPGART_VERSION_MINOR);
 	return 0;
 }