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)
commitf0eef25339f92f7cd4aeea23d9ae97987a5a1e82
tree2472e94d39f43a9580a6d2d5d92de0b749023263
parent0cfea5dd98205f2fa318836da664a7d7df1afbc1
parente1036502e5263851259d147771226161e5ccc85a
Merge ../linus
drivers/char/agp/Kconfig
drivers/char/agp/generic.c