Merge ../linus
authorDave Jones <davej@redhat.com>
Thu, 29 Jun 2006 20:01:54 +0000 (16:01 -0400)
committerDave Jones <davej@redhat.com>
Thu, 29 Jun 2006 20:01:54 +0000 (16:01 -0400)
Conflicts:

drivers/char/agp/Kconfig


Trivial merge