Merge branch topic/uek-4.1/sparc of git://ca-git.us.oracle.com/linux-uek into uek...

diff --cc arch/sparc/Kconfig
index beada789d489cfcfc1270b3c2f1f5588b70e588f,2d976677c51156477de90050afc72eea36955e3d..b29233d4968151c29eecee5a14242b8c0a179e9d
--- 1/arch/sparc/Kconfig
--- 2/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@@ -158,9 -158,9 +158,12 @@@ config PGTABLE_LEVEL
        default 4 if 64BIT
        default 3
  
 +config ARCH_SUPPORTS_DTRACE
 +      def_bool y if SPARC64
 +
+ config ARCH_SUPPORTS_UPROBES
+       def_bool y if SPARC64
+ 
  source "init/Kconfig"
  
  source "kernel/Kconfig.freezer"

diff --cc arch/sparc/include/asm/kdebug_64.h
Simple merge

diff --cc arch/sparc/mm/fault_64.c
Simple merge

diff --cc drivers/char/ipmi/ipmi_si_intf.c
Simple merge

diff --cc kernel/fork.c
Simple merge