diff --git a/[refs] b/[refs]
index 8643f703f137..1d21db82ea72 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a3ba68f969b2407b6809a840f6ff45ab0eb06f84
+refs/heads/master: dbc1c5c250cbedccf3571597d156e581e34b2944
diff --git a/trunk/arch/powerpc/Kconfig b/trunk/arch/powerpc/Kconfig
index c171f5bcf258..bbe149c26518 100644
--- a/trunk/arch/powerpc/Kconfig
+++ b/trunk/arch/powerpc/Kconfig
@@ -19,9 +19,6 @@ config WORD_SIZE
 	default 64 if PPC64
 	default 32 if !PPC64
 
-config PPC_MERGE
-	def_bool y
-
 config MMU
 	bool
 	default y