Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
	lib/Kconfig.debug

diff --cc arch/sparc/kernel/smp_64.c
index 1011fbf451bbe8658789da20d35a32efca3548c6,4c53345281093713d8492233e198fd5c07fcbdfe..b6a2b8f47040b2eb6d5f8fdf82ad2c696d9fe733
--- 1/arch/sparc/kernel/smp_64.c
--- 2/arch/sparc/kernel/smp_64.c
+++ b/arch/sparc/kernel/smp_64.c
@@@ -22,8 -22,8 +22,9 @@@
  #include <linux/profile.h>
  #include <linux/bootmem.h>
  #include <linux/vmalloc.h>
 +#include <linux/ftrace.h>
  #include <linux/cpu.h>
+ #include <linux/slab.h>
  
  #include <asm/head.h>
  #include <asm/ptrace.h>

diff --cc arch/sparc/kernel/traps_64.c
Simple merge

diff --cc lib/Kconfig.debug
index 6c2be60895590fe1b6596aa49362ee8a711af0e7,ff017108700d5da49e7ce38c6735b1979d4f3d31..935248bdbc471aaf8485ef545784b70313c9dfda
--- 1/lib/Kconfig.debug
--- 2/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@@ -356,7 -356,7 +356,7 @@@ config SLUB_STAT
  config DEBUG_KMEMLEAK
        bool "Kernel memory leak detector"
        depends on DEBUG_KERNEL && EXPERIMENTAL && !MEMORY_HOTPLUG && \
-               (X86 || ARM || PPC || S390 || SPARC64 || SUPERH)
 -              (X86 || ARM || PPC || S390 || SUPERH || MICROBLAZE)
++              (X86 || ARM || PPC || S390 || SPARC64 || SUPERH || MICROBLAZE)
  
        select DEBUG_FS if SYSFS
        select STACKTRACE if STACKTRACE_SUPPORT