Merge commit 'v2.6.35-rc6' into devicetree/next

Conflicts:
	arch/sparc/kernel/prom_64.c

1 files changed, 3 insertions, 3 deletions

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index c9ae321a06f9..5bf34019bd66 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -134,7 +134,7 @@ config PPC
         select HAVE_ARCH_KGDB
         select HAVE_KRETPROBES
         select HAVE_ARCH_TRACEHOOK
-        select HAVE_LMB
+        select HAVE_MEMBLOCK
         select HAVE_DMA_ATTRS
         select HAVE_DMA_API_DEBUG
         select USE_GENERIC_SMP_HELPERS if SMP
@@ -394,7 +394,7 @@ config IRQ_ALL_CPUS
 
 config SPARSE_IRQ
         bool "Support sparse irq numbering"
-        default y
+        default n
         help
           This enables support for sparse irqs. This is useful for distro
           kernels that want to define a high CONFIG_NR_CPUS value but still
@@ -403,7 +403,7 @@ config SPARSE_IRQ
           ( Sparse IRQs can also be beneficial on NUMA boxes, as they spread
             out the irq_desc[] array in a more NUMA-friendly way. )
 
-          If you don't know what to do here, say Y.
+          If you don't know what to do here, say N.
 
 config NUMA
         bool "NUMA support"