Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f41fc80 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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.
parents 0806ca2a 70e8992e

MAINTAINERS

+3 −4
Original line number Original line Diff line number Diff line
@@ -315,10 +315,9 @@ M: zippel@linux-m68k.org 
S:	Maintained

S:	Maintained





AGPGART DRIVER

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

S:	Maintained





AHA152X SCSI DRIVER

AHA152X SCSI DRIVER

drivers/char/agp/backend.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -321,7 +321,7 @@ EXPORT_SYMBOL(agp_try_unsupported_boot); 
static int __init agp_init(void)

static int __init agp_init(void)

{

{

	if (!agp_off)

	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);

			AGPGART_VERSION_MAJOR, AGPGART_VERSION_MINOR);

	return 0;

	return 0;

}

}