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

+3 -1
+1 -1
arch/sparc64/kernel/systbls.S
··· 98 .word sys_umount, sys_setgid, sys_getgid, sys_signal, sys_geteuid 99 /*50*/ .word sys_getegid, sys_acct, sys_memory_ordering, sys_nis_syscall, sys_ioctl 100 .word sys_reboot, sys_nis_syscall, sys_symlink, sys_readlink, sys_execve 101 - /*60*/ .word sys_umask, sys_chroot, sys_newfstat, sys_stat64, sys_getpagesize 102 .word sys_msync, sys_vfork, sys_pread64, sys_pwrite64, sys_nis_syscall 103 /*70*/ .word sys_nis_syscall, sys_mmap, sys_nis_syscall, sys64_munmap, sys_mprotect 104 .word sys_madvise, sys_vhangup, sys_nis_syscall, sys_mincore, sys_getgroups
··· 98 .word sys_umount, sys_setgid, sys_getgid, sys_signal, sys_geteuid 99 /*50*/ .word sys_getegid, sys_acct, sys_memory_ordering, sys_nis_syscall, sys_ioctl 100 .word sys_reboot, sys_nis_syscall, sys_symlink, sys_readlink, sys_execve 101 + /*60*/ .word sys_umask, sys_chroot, sys_newfstat, sys_fstat64, sys_getpagesize 102 .word sys_msync, sys_vfork, sys_pread64, sys_pwrite64, sys_nis_syscall 103 /*70*/ .word sys_nis_syscall, sys_mmap, sys_nis_syscall, sys64_munmap, sys_mprotect 104 .word sys_madvise, sys_vhangup, sys_nis_syscall, sys_mincore, sys_getgroups
+2
include/linux/mutex-debug.h
··· 1 #ifndef __LINUX_MUTEX_DEBUG_H 2 #define __LINUX_MUTEX_DEBUG_H 3 4 /* 5 * Mutexes - debugging helpers: 6 */
··· 1 #ifndef __LINUX_MUTEX_DEBUG_H 2 #define __LINUX_MUTEX_DEBUG_H 3 4 + #include <linux/linkage.h> 5 + 6 /* 7 * Mutexes - debugging helpers: 8 */