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

diff --combined arch/sparc64/kernel/systbls.S
index 37e9acc9e58740d5307cee3dcba670bdabc77f42,4821ef1ea07a2f5ade5020c035eb42dbe769cd7c..98d24bc0004441ea0e57f3ef4cc5feb003d0dff7
--- 1/arch/sparc64/kernel/systbls.S
--- 2/arch/sparc64/kernel/systbls.S
+++ b/arch/sparc64/kernel/systbls.S
@@@ -73,7 -73,7 +73,7 @@@ sys_call_table32
  /*250*/       .word sys32_mremap, sys32_sysctl, sys32_getsid, sys_fdatasync, sys32_nfsservctl
        .word sys_ni_syscall, sys32_clock_settime, compat_sys_clock_gettime, compat_sys_clock_getres, sys32_clock_nanosleep
  /*260*/       .word compat_sys_sched_getaffinity, compat_sys_sched_setaffinity, sys32_timer_settime, compat_sys_timer_gettime, sys_timer_getoverrun
 -      .word sys_timer_delete, sys32_timer_create, sys_ni_syscall, compat_sys_io_setup, sys_io_destroy
 +      .word sys_timer_delete, compat_sys_timer_create, sys_ni_syscall, compat_sys_io_setup, sys_io_destroy
  /*270*/       .word sys32_io_submit, sys_io_cancel, compat_sys_io_getevents, sys32_mq_open, sys_mq_unlink
        .word compat_sys_mq_timedsend, compat_sys_mq_timedreceive, compat_sys_mq_notify, compat_sys_mq_getsetattr, compat_sys_waitid
  /*280*/       .word sys_ni_syscall, sys_add_key, sys_request_key, sys_keyctl
@@@ -98,7 -98,7 +98,7 @@@ sys_call_table
        .word sys_umount, sys_setgid, sys_getgid, sys_signal, sys_geteuid
  /*50*/        .word sys_getegid, sys_acct, sys_memory_ordering, sys_nis_syscall, sys_ioctl
        .word sys_reboot, sys_nis_syscall, sys_symlink, sys_readlink, sys_execve
- /*60*/        .word sys_umask, sys_chroot, sys_newfstat, sys_stat64, sys_getpagesize
+ /*60*/        .word sys_umask, sys_chroot, sys_newfstat, sys_fstat64, sys_getpagesize
        .word sys_msync, sys_vfork, sys_pread64, sys_pwrite64, sys_nis_syscall
  /*70*/        .word sys_nis_syscall, sys_mmap, sys_nis_syscall, sys64_munmap, sys_mprotect
        .word sys_madvise, sys_vhangup, sys_nis_syscall, sys_mincore, sys_getgroups