Merge ../linus

Conflicts:

	drivers/char/agp/Kconfig

diff --cc drivers/char/agp/Kconfig
index 3dbbb9544ae8c7a80c9c710b3781d6ace14b9169,9826a399fa02b053c2bf9568a5192e510bb873f3..22f8cf218cc6443a1af9f523ae49dfc47fe56340
--- 1/drivers/char/agp/Kconfig
--- 2/drivers/char/agp/Kconfig
+++ b/drivers/char/agp/Kconfig
@@@ -1,8 -1,6 +1,7 @@@
  config AGP
-       tristate "/dev/agpgart (AGP Support)" if !GART_IOMMU
+       tristate "/dev/agpgart (AGP Support)"
        depends on ALPHA || IA64 || PPC || X86
-       default y if GART_IOMMU
 +      depends on PCI
        ---help---
          AGP (Accelerated Graphics Port) is a bus system mainly used to
          connect graphics cards to the rest of the system.

diff --cc drivers/char/agp/amd64-agp.c
Simple merge

diff --cc drivers/char/agp/ati-agp.c
Simple merge