]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
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)
commit55b4d6a52195a8f277ffddf755ddaff359878f41
tree06a3183a562f8da4688f65023f7a18dcad702956
parentadf8a287150667feb5747f8beade62acacc17d4e
parent1f1332f727c3229eb2166a83fec5d3de6a73dce2
Merge ../linus

Conflicts:

drivers/char/agp/Kconfig
drivers/char/agp/Kconfig
drivers/char/agp/amd64-agp.c
drivers/char/agp/ati-agp.c