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.

2 files changed, 4 insertions, 5 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
diff --git a/drivers/char/agp/backend.c b/drivers/char/agp/backend.c
index ebdd6dd66edb..1b47c89a1b99 100644
--- 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;
 }