]> err.no Git - linux-2.6/commitdiff
Merge ../linus
authorDave Jones <davej@redhat.com>
Tue, 12 Dec 2006 23:13:32 +0000 (18:13 -0500)
committerDave Jones <davej@redhat.com>
Tue, 12 Dec 2006 23:13:32 +0000 (18:13 -0500)
1  2 
drivers/char/agp/Kconfig
drivers/char/agp/generic.c

Simple merge
Simple merge