aboutsummaryrefslogtreecommitdiffstats
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
parent0806ca2ab3ef7d7a1bd41a980f661a13ba11acb5 (diff)
parent70e8992ec771793e18d33d3a6f2247e558baf6ac (diff)
downloadmrst-s0i3-test-2f41fc806434f8466bb361570589a3f6099ca65d.tar.gz
mrst-s0i3-test-2f41fc806434f8466bb361570589a3f6099ca65d.tar.xz
mrst-s0i3-test-2f41fc806434f8466bb361570589a3f6099ca65d.zip
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.
-rw-r--r--MAINTAINERS7
-rw-r--r--drivers/char/agp/backend.c2
2 files changed, 4 insertions, 5 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index b2c541591e4..228a45b8dc6 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 ebdd6dd66ed..1b47c89a1b9 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;
}