Merge ../linus

author Dave Jones <davej@redhat.com>

Tue, 12 Dec 2006 23:13:32 +0000 (18:13 -0500)

committer Dave Jones <davej@redhat.com>

Tue, 12 Dec 2006 23:13:32 +0000 (18:13 -0500)
author Dave Jones <davej@redhat.com>
Tue, 12 Dec 2006 23:13:32 +0000 (18:13 -0500)
committer Dave Jones <davej@redhat.com>
Tue, 12 Dec 2006 23:13:32 +0000 (18:13 -0500)
diff --cc drivers/char/agp/Kconfig
Simple merge
diff --cc drivers/char/agp/generic.c
Simple merge
author	Dave Jones <davej@redhat.com>
	Tue, 12 Dec 2006 23:13:32 +0000 (18:13 -0500)
committer	Dave Jones <davej@redhat.com>
	Tue, 12 Dec 2006 23:13:32 +0000 (18:13 -0500)
		1	2
drivers/char/agp/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/char/agp/generic.c	patch \|	diff1 \|	diff2 \|	blob \| history