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

Conflicts:
	net/mac80211/main.c

2 files changed, 6 insertions, 3 deletions

diff --git a/arch/avr32/kernel/process.c b/arch/avr32/kernel/process.c
index e5daddff397..9c46aaad11c 100644
--- a/arch/avr32/kernel/process.c
+++ b/arch/avr32/kernel/process.c
@@ -384,8 +384,9 @@ asmlinkage int sys_vfork(struct pt_regs *regs)
 }
 
 asmlinkage int sys_execve(const char __user *ufilename,
-                          char __user *__user *uargv,
-                          char __user *__user *uenvp, struct pt_regs *regs)
+                          const char __user *const __user *uargv,
+                          const char __user *const __user *uenvp,
+                          struct pt_regs *regs)
 {
         int error;
         char *filename;
diff --git a/arch/avr32/kernel/sys_avr32.c b/arch/avr32/kernel/sys_avr32.c
index 459349b5ed5..62635a09ae3 100644
--- a/arch/avr32/kernel/sys_avr32.c
+++ b/arch/avr32/kernel/sys_avr32.c
@@ -7,7 +7,9 @@
  */
 #include <linux/unistd.h>
 
-int kernel_execve(const char *file, char **argv, char **envp)
+int kernel_execve(const char *file,
+                  const char *const *argv,
+                  const char *const *envp)
 {
         register long scno asm("r8") = __NR_execve;
         register long sc1 asm("r12") = (long)file;