Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Make use of the new fs/compat_binfmt_elf.c
  [SPARC64]: Make use of compat_sys_ptrace()

Manually fixed trivial delete/modift conflict in arch/sparc64/kernel/binfmt_elf32.c

diff --combined arch/sparc64/Kconfig
index 5023b815e52274d6ef0445120c0b686133ffb286,565404ddcdc415247d92e576b8bec9ee2a8e1825..b810f2b7526a605b1f783c021190bc8304c7ac0f
--- 1/arch/sparc64/Kconfig
--- 2/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@@ -81,9 -81,6 +81,9 @@@ config GENERIC_HARDIRQS_NO__DO_IR
        bool
        def_bool y
  
 +config ARCH_SUPPORTS_AOUT
 +      def_bool y
 +
  choice
        prompt "Kernel page size"
        default SPARC64_PAGE_SIZE_8KB
@@@ -383,17 -380,11 +383,11 @@@ config COMPA
        bool
        depends on SPARC32_COMPAT
        default y
- 
- config BINFMT_ELF32
-       bool "Kernel support for 32-bit ELF binaries"
-       depends on SPARC32_COMPAT
-       help
-         This allows you to run 32-bit Linux/ELF binaries on your Ultra.
-         Everybody wants this; say Y.
+       select COMPAT_BINFMT_ELF
  
  config BINFMT_AOUT32
        bool "Kernel support for 32-bit (ie. SunOS) a.out binaries"
 -      depends on SPARC32_COMPAT
 +      depends on SPARC32_COMPAT && ARCH_SUPPORTS_AOUT
        help
          This allows you to run 32-bit a.out format binaries on your Ultra.
          If you want to run SunOS binaries (see SunOS binary emulation below)