Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

Conflicts:

	net/sunrpc/auth_gss/gss_krb5_crypto.c
	net/sunrpc/auth_gss/gss_spkm3_token.c
	net/sunrpc/clnt.c

Merge with mainline and fix conflicts.

1 files changed, 4 insertions, 9 deletions

diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index 8eb82efe05a1..0df9c33629fd 100644
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -670,15 +670,6 @@ config RADSTONE_PPC7D
 config PAL4
         bool "SBS-Palomar4"
 
-config GEMINI
-        bool "Synergy-Gemini"
-        depends on BROKEN
-        select PPC_INDIRECT_PCI
-        help
-          Select Gemini if configuring for a Synergy Microsystems' Gemini
-          series Single Board Computer.  More information is available at:
-          <http://www.synergymicro.com/PressRel/97_10_15.html>.
-
 config EST8260
         bool "EST8260"
         ---help---
@@ -1186,6 +1177,10 @@ config ISA
           have an IBM RS/6000 or pSeries machine or a PReP machine, say Y.  If
           you have an embedded board, consult your board documentation.
 
+config ZONE_DMA
+        bool
+        default y
+
 config GENERIC_ISA_DMA
         bool
         depends on 6xx && !CPM2