Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:
	arch/sh/kernel/process_32.c

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --cc arch/sh/include/asm/syscalls_32.h
index be201fdc97aa79bbf5470c8a582e20ecb7e78991,be201fdc97aa79bbf5470c8a582e20ecb7e78991..ae717e3c26d6d4178c1260c1602099d86534caed
--- 1/arch/sh/include/asm/syscalls_32.h
--- 2/arch/sh/include/asm/syscalls_32.h
+++ b/arch/sh/include/asm/syscalls_32.h
@@@ -19,9 -19,9 +19,10 @@@ asmlinkage int sys_clone(unsigned long 
  asmlinkage int sys_vfork(unsigned long r4, unsigned long r5,
                         unsigned long r6, unsigned long r7,
                         struct pt_regs __regs);
--asmlinkage int sys_execve(const char __user *ufilename, char __user * __user *uargv,
--                        char __user * __user *uenvp, unsigned long r7,
--                        struct pt_regs __regs);
++asmlinkage int sys_execve(const char __user *ufilename,
++                        const char __user *const __user *uargv,
++                        const char __user *const __user *uenvp,
++                        unsigned long r7, struct pt_regs __regs);
  asmlinkage int sys_sigsuspend(old_sigset_t mask, unsigned long r5,
                              unsigned long r6, unsigned long r7,
                              struct pt_regs __regs);