Pull utrace into release branch

diff --cc arch/ia64/Kconfig
Simple merge

diff --cc arch/ia64/ia32/ia32_entry.S
index 82a7a0b,a73ec00..a8cf199
--- 1/arch/ia64/ia32/ia32_entry.S
--- 2/arch/ia64/ia32/ia32_entry.S
+++ b/arch/ia64/ia32/ia32_entry.S
@@@ -199,10 -204,10 +204,10 @@@ ia32_syscall_table
        data8 sys_setuid        /* 16-bit version */
        data8 sys_getuid        /* 16-bit version */
        data8 compat_sys_stime    /* 25 */
-       data8 sys32_ptrace
+       data8 compat_sys_ptrace
        data8 sys32_alarm
        data8 sys_ni_syscall
 -      data8 sys32_pause
 +      data8 sys_pause
        data8 compat_sys_utime    /* 30 */
        data8 sys_ni_syscall      /* old stty syscall holder */
        data8 sys_ni_syscall      /* old gtty syscall holder */

diff --cc arch/ia64/ia32/sys_ia32.c
Simple merge