Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] Add latest crop of syscalls
  [IA64] Fix 64-bit atomic routines to return "long"

diff --combined arch/ia64/include/asm/unistd.h
index 46f36fc5125fbdc2a465692a5766e3a37fb9d632,637e90f11d853b55a6a908d0327a641d9887db57..87f1bd1efc82b7c46eb7a1e35c7e337c83625411
--- 1/arch/ia64/include/asm/unistd.h
--- 2/arch/ia64/include/asm/unistd.h
+++ b/arch/ia64/include/asm/unistd.h
@@@ -312,11 -312,14 +312,14 @@@
  #define __NR_pwritev                  1320
  #define __NR_rt_tgsigqueueinfo                1321
  #define __NR_recvmmsg                 1322
+ #define __NR_fanotify_init            1323
+ #define __NR_fanotify_mark            1324
+ #define __NR_prlimit64                        1325
  
  #ifdef __KERNEL__
  
  
- #define NR_syscalls                   299 /* length of syscall table */
+ #define NR_syscalls                   302 /* length of syscall table */
  
  /*
   * The following defines stop scripts/checksyscalls.sh from complaining about
@@@ -353,7 -356,7 +356,7 @@@ asmlinkage unsigned long sys_mmap2
                                int fd, long pgoff);
  struct pt_regs;
  struct sigaction;
 -long sys_execve(char __user *filename, char __user * __user *argv,
 +long sys_execve(const char __user *filename, char __user * __user *argv,
                           char __user * __user *envp, struct pt_regs *regs);
  asmlinkage long sys_ia64_pipe(void);
  asmlinkage long sys_rt_sigaction(int sig,